From: Chunrong Guo <chunrong....@nxp.com>
* busybox installs link to base_bindir not bindir
/bin/link -> busybox
* so u-a for coreutils fails: update-alternatives: Error: cannot register
alternative link to /usr/bin/link since it is already registered to /bin/link
Signed-off-by: Chunrong Guo <chunrong....@nxp.com>
---
meta/recipes-core/coreutils/coreutils_8.28.bb | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/coreutils/coreutils_8.28.bb
b/meta/recipes-core/coreutils/coreutils_8.28.bb
index 8a9e80c..a1cd8f7 100644
--- a/meta/recipes-core/coreutils/coreutils_8.28.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.28.bb
@@ -48,10 +48,10 @@ PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr,"
PACKAGECONFIG[single-binary] =
"--enable-single-binary,--disable-single-binary,,"
-# [ df mktemp base64 gets a special treatment and is not included in this
+# [ df link mktemp base64 gets a special treatment and is not included in this
bindir_progs = "arch basename chcon cksum comm csplit cut dir dircolors
dirname du \
env expand expr factor fmt fold groups head hostid id install \
- join link logname md5sum mkfifo nice nl nohup nproc od paste
pathchk \
+ join logname md5sum mkfifo nice nl nohup nproc od paste
pathchk \
pinky pr printenv printf ptx readlink realpath runcon seq
sha1sum sha224sum sha256sum \
sha384sum sha512sum shred shuf sort split stdbuf sum tac tail
tee test timeout\
tr truncate tsort tty unexpand uniq unlink uptime users vdir
wc who whoami yes"
@@ -83,7 +83,7 @@ do_install_class-native() {
}
do_install_append() {
- for i in df mktemp base64; do mv ${D}${bindir}/$i
${D}${bindir}/$i.${BPN}; done
+ for i in df link mktemp base64; do mv ${D}${bindir}/$i
${D}${bindir}/$i.${BPN}; done
install -d ${D}${base_bindir}
[ "${base_bindir}" != "${bindir}" ] && for i in ${base_bindir_progs};
do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${BPN}; done
@@ -107,8 +107,8 @@ do_install_append() {
inherit update-alternatives
ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs}
${sbindir_progs} base64 mktemp df"
-ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1 groups.1 kill.1
uptime.1 stat.1 hostname.1"
+ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs}
${sbindir_progs} base64 mktemp df link"
+ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 link.1 lbracket.1 groups.1
kill.1 uptime.1 stat.1 hostname.1"
ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
@@ -124,6 +124,10 @@ ALTERNATIVE_LINK_NAME[df] = "${base_bindir}/df"
ALTERNATIVE_TARGET[df] = "${bindir}/df.${BPN}"
ALTERNATIVE_LINK_NAME[df.1] = "${mandir}/man1/df.1"
+ALTERNATIVE_LINK_NAME[link] = "${base_bindir}/link"
+ALTERNATIVE_TARGET[link] = "${bindir}/link.${BPN}"
+ALTERNATIVE_LINK_NAME[link.1] = "${mandir}/man1/link.1"
+
ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/["
ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}"
ALTERNATIVE_LINK_NAME[lbracket.1] = "${mandir}/man1/lbracket.1"
--
1.9.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
