From b9bf37ec6792f82753fe265fdcfc19db7dd51ab6 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 9 Feb 2018 15:49:32 +0800 Subject: coreutils: fix hostname conflict with other packages The hostname utility is also provided by busybox and net-tools. So use alternatives mechanism to manage it in coreutils. Make its priority higher than busybox. As hostname is not built by default for coreutils, we make its priority lower than net-tools. (From OE-Core rev: fbdc676878cf2a29654e071a7c5afd5114cc9e0b) Signed-off-by: Chen Qi Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_8.29.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/coreutils') diff --git a/meta/recipes-core/coreutils/coreutils_8.29.bb b/meta/recipes-core/coreutils/coreutils_8.29.bb index 8df88020e3..0b8acc5884 100644 --- a/meta/recipes-core/coreutils/coreutils_8.29.bb +++ b/meta/recipes-core/coreutils/coreutils_8.29.bb @@ -52,7 +52,7 @@ bindir_progs = "arch basename chcon cksum comm csplit cut dir dircolors dirname tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes" # hostname gets a special treatment and is not included in this -base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \ +base_bindir_progs = "cat chgrp chmod chown cp date dd echo false hostname kill ln ls mkdir \ mknod mv pwd rm rmdir sleep stty sync touch true uname stat" sbindir_progs= "chroot" @@ -95,6 +95,8 @@ do_install_append() { inherit update-alternatives ALTERNATIVE_PRIORITY = "100" +# Make hostname's priority higher than busybox but lower than net-tools +ALTERNATIVE_PRIORITY[hostname] = "90" ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df" ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1" -- cgit v1.2.3-54-g00ecf