hostname: fix conflicting installs of /bin/hostname

Surprisingly long-standing issue with conflicting /bin/hostname
installs.  Reported as early as November 2005 by Joseph Dupre.

All together at one point or another there are at least 4 possible
sources of /bin/hostname:

        busybox
        util-linux
        coreutils
        net-tools

Buildroot depends on the -F flag being available in the default
/etc/inittab.  Out of the 4 listed projects only net-tools and buildroot
for sure support the -F flag.  I'm a little unclear on util-linux as it
has been removed entirely (in favor of net-tools) for some time.

As of coreutils 6.9.90 (2007-12-01), coreutils does not install its
/bin/hostname by default.  The following commit reenabled its build:

d6e58cb coreutils: fixed missing hostname (Sep 2010)

This was done to fix a build error in coreutils regarding help2man.  A
later patch:

30c5105 coreutils: bump to version 8.21

disabled the help2man functionality entirely but left hostname being
installed.

On a very related note, net-tools now contains an obsolete check to add
util-linux as a dependency to force it to build first (so that net-tools
ends up with /bin/hostname).

This patch fixes both of these issues so that hostname always comes from
one of two places:

    busybox
    net-tools

Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Co-authored-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index e6af7e297bd6553c9a773282a0db12b6fad8220a..a2b8099443e11104d7e1f42972e6fc352893676d 100644 (file)
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -20,7 +20,7 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 COREUTILS_DEPENDENCIES = busybox
 endif
 
-COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false hostname \
+COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \
        ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \
        uname join
 
@@ -61,8 +61,7 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
                utils_cv_localtime_cache=no \
                PERL=missing
 
-COREUTILS_CONF_OPT = --disable-rpath \
-               --enable-install-program=hostname
+COREUTILS_CONF_OPT = --disable-rpath
 
 define COREUTILS_POST_INSTALL
        # some things go in root rather than usr

diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk
index 35386558cd6ac09071b8fd5790abf3aa551a5837..a2abf5bbd9d29231bdf28a772dae6a21658f2471 100644 (file)
--- a/package/net-tools/net-tools.mk
+++ b/package/net-tools/net-tools.mk
@@ -17,11 +17,6 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
        NET_TOOLS_DEPENDENCIES += busybox
 endif
 
-# Install after util-linux since net-tools hostname is better
-ifeq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES),y)
-       NET_TOOLS_DEPENDENCIES += util-linux
-endif
-
 define NET_TOOLS_CONFIGURE_CMDS
        (cd $(@D); yes "" | ./configure.sh config.in )
 endef