summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-12-01 12:02:09 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-01 12:20:01 (GMT)
commit1f8405e5365408c2b7dd08b5e6e0b09acd73a5bc (patch)
treea3a75a4019b6fa0ec388ec875c5d144744a79b7b
parentd10d614d01fdf82fe2d641c4eb5c9a06ac17f8c0 (diff)
downloadpoky-1f8405e5365408c2b7dd08b5e6e0b09acd73a5bc.tar.gz
coreutils: fix u-a for base64, mktemp and df
* busybox installs mktemp and df to base_bindir not bindir SHR root@gjama ~ $ ll /bin/df /bin/mktemp /bin/base64 lrwxrwxrwx 1 root root 7 Nov 10 15:44 /bin/df -> busybox lrwxrwxrwx 1 root root 7 Nov 10 15:44 /bin/mktemp -> busybox lrwxrwxrwx 1 root root 7 Nov 28 15:48 /bin/base64 -> busybox * so u-a for coreutils fails: update-alternatives: Error: cannot register alternative base64 to /usr/bin/base64 since it is already registered to /bin/base64 update-alternatives: Error: cannot register alternative mktemp to /usr/bin/mktemp since it is already registered to /bin/mktemp update-alternatives: Error: cannot register alternative df to /usr/bin/df since it is already registered to /bin/df (From OE-Core rev: 7f71e866ecdbe0491c26b4eb5b83d8d2573f8eda) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/coreutils/coreutils_8.14.bb20
1 files changed, 14 insertions, 6 deletions
diff --git a/meta/recipes-core/coreutils/coreutils_8.14.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb
index 01face0..cc05d88 100644
--- a/meta/recipes-core/coreutils/coreutils_8.14.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.14.bb
@@ -7,7 +7,7 @@ BUGTRACKER = "http://debbugs.gnu.org/coreutils"
7LICENSE = "GPLv3+" 7LICENSE = "GPLv3+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ 8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
9 file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad" 9 file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad"
10PR = "r1" 10PR = "r2"
11DEPENDS = "gmp" 11DEPENDS = "gmp"
12DEPENDS_virtclass-native = "" 12DEPENDS_virtclass-native = ""
13 13
@@ -21,13 +21,13 @@ SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d
21 21
22EXTRA_OECONF_virtclass-native = "--without-gmp" 22EXTRA_OECONF_virtclass-native = "--without-gmp"
23 23
24# [ gets a special treatment and is not included in this 24# [ df mktemp base64 gets a special treatment and is not included in this
25bindir_progs = "base64 basename chcon cksum comm csplit cut dir dircolors dirname du \ 25bindir_progs = "basename chcon cksum comm csplit cut dir dircolors dirname du \
26 env expand expr factor fmt fold groups head hostid id install \ 26 env expand expr factor fmt fold groups head hostid id install \
27 join link logname md5sum mkfifo mktemp nice nl nohup nproc od paste pathchk \ 27 join link logname md5sum mkfifo nice nl nohup nproc od paste pathchk \
28 pinky pr printenv printf ptx readlink runcon seq sha1sum sha224sum sha256sum \ 28 pinky pr printenv printf ptx readlink runcon seq sha1sum sha224sum sha256sum \
29 sha384sum sha512sum shred shuf sort split stat stdbuf sum tac tail tee test timeout\ 29 sha384sum sha512sum shred shuf sort split stat stdbuf sum tac tail tee test timeout\
30 tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes df" 30 tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes"
31 31
32# hostname gets a special treatment and is not included in this 32# hostname gets a special treatment and is not included in this
33base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \ 33base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \
@@ -36,7 +36,7 @@ base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdi
36sbindir_progs= "chroot" 36sbindir_progs= "chroot"
37 37
38do_install_append() { 38do_install_append() {
39 for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done 39 for i in ${bindir_progs} df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
40 40
41 install -d ${D}${base_bindir} 41 install -d ${D}${base_bindir}
42 for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done 42 for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done
@@ -61,6 +61,11 @@ pkg_postinst_${PN} () {
61 61
62 # Special cases. [ needs to be treated separately. 62 # Special cases. [ needs to be treated separately.
63 update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 63 update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
64
65 # Special cases. base64, mktemp and df need to be treated separately, because busybox have them in base_binding not bindir
66 update-alternatives --install ${base_bindir}/base64 base64 ${bindir}/base64.${PN} 100;
67 update-alternatives --install ${base_bindir}/mktemp mktemp ${bindir}/mktemp.${PN} 100;
68 update-alternatives --install ${base_bindir}/df df ${bindir}/df.${PN} 100;
64} 69}
65 70
66pkg_prerm_${PN} () { 71pkg_prerm_${PN} () {
@@ -74,6 +79,9 @@ pkg_prerm_${PN} () {
74 update-alternatives --remove hostname hostname.${PN} 79 update-alternatives --remove hostname hostname.${PN}
75 update-alternatives --remove uptime uptime.${PN} 80 update-alternatives --remove uptime uptime.${PN}
76 update-alternatives --remove '[' 'lbracket.${PN}' 81 update-alternatives --remove '[' 'lbracket.${PN}'
82 update-alternatives --remove base64 ${bindir}/base64.${PN}
83 update-alternatives --remove mktemp ${bindir}/mktemp.${PN}
84 update-alternatives --remove df ${bindir}.df.${PN}
77} 85}
78 86
79BBCLASSEXTEND = "native" 87BBCLASSEXTEND = "native"