diff options
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.14.bb | 20 |
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 01face020f..cc05d8851a 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" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad" -PR = "r1" +PR = "r2" DEPENDS = "gmp" DEPENDS_virtclass-native = "" @@ -21,13 +21,13 @@ SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d EXTRA_OECONF_virtclass-native = "--without-gmp" -# [ gets a special treatment and is not included in this -bindir_progs = "base64 basename chcon cksum comm csplit cut dir dircolors dirname du \ +# [ df mktemp base64 gets a special treatment and is not included in this +bindir_progs = "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 mktemp nice nl nohup nproc od paste pathchk \ + join link logname md5sum mkfifo nice nl nohup nproc od paste pathchk \ pinky pr printenv printf ptx readlink runcon seq sha1sum sha224sum sha256sum \ sha384sum sha512sum shred shuf sort split stat stdbuf sum tac tail tee test timeout\ - tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes df" + 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 \ @@ -36,7 +36,7 @@ base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdi sbindir_progs= "chroot" do_install_append() { - for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done + for i in ${bindir_progs} df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done install -d ${D}${base_bindir} for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done @@ -61,6 +61,11 @@ pkg_postinst_${PN} () { # Special cases. [ needs to be treated separately. update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100 + + # Special cases. base64, mktemp and df need to be treated separately, because busybox have them in base_binding not bindir + update-alternatives --install ${base_bindir}/base64 base64 ${bindir}/base64.${PN} 100; + update-alternatives --install ${base_bindir}/mktemp mktemp ${bindir}/mktemp.${PN} 100; + update-alternatives --install ${base_bindir}/df df ${bindir}/df.${PN} 100; } pkg_prerm_${PN} () { @@ -74,6 +79,9 @@ pkg_prerm_${PN} () { update-alternatives --remove hostname hostname.${PN} update-alternatives --remove uptime uptime.${PN} update-alternatives --remove '[' 'lbracket.${PN}' + update-alternatives --remove base64 ${bindir}/base64.${PN} + update-alternatives --remove mktemp ${bindir}/mktemp.${PN} + update-alternatives --remove df ${bindir}.df.${PN} } BBCLASSEXTEND = "native" |