mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

coreutils: fix hostname conflict with other packages

Browse Source 
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 <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chen Qi
2018-02-09 15:49:32 +08:00
committed by Richard Purdie
parent 51c6e1d1cb
commit b9bf37ec67
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/coreutils/coreutils_8.29.bb
+3 -1
View File
@@ -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" 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 # 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" mknod mv pwd rm rmdir sleep stty sync touch true uname stat"
sbindir_progs= "chroot" sbindir_progs= "chroot"
@@ -95,6 +95,8 @@ do_install_append() {
inherit update-alternatives inherit update-alternatives
ALTERNATIVE_PRIORITY = "100" 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} = "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" ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1"