1 files changed, 17 insertions, 29 deletions

diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index bbde63c697..6789b8c11d 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -38,59 +38,47 @@ bindir_progs = "base64 basename cksum comm csplit cut dir dircolors dirname du \
                 join link logname md5sum mkfifo nice nl nohup od paste pathchk \
                 pinky pr printenv printf ptx readlink seq sha1sum sha224sum sha256sum \
                 sha384sum sha512sum shred shuf sort split stat sum tac tail tee test \
-                tr tsort tty unexpand uniq unlink users vdir wc who whoami yes"
+                tr tsort tty unexpand uniq unlink users vdir wc who whoami yes uptime"
 
 # 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 \
-                     mknod mv pwd rm rmdir sleep stty sync touch true uname"
+                     mknod mv pwd rm rmdir sleep stty sync touch true uname hostname"
 
 sbindir_progs= "chroot"
 
 do_install() {
         autotools_do_install
 
-        for i in ${bindir_progs}; 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
+        [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done
 
         install -d ${D}${sbindir}
-        for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done
+        [ "${bindir}" != "${sbindir}" ] && for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i; done
 
         # [ requires special handling because [.coreutils will cause the sed stuff
         # in update-alternatives to fail, therefore use lbracket - the name used
         # for the actual source file.
-        mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN}
-
-        # hostname and uptime separated. busybox's versions are preferred
-        mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
-        mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN}
+        mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN}
 }
 
-pkg_postinst_${PN} () {
-        for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
+inherit update-alternatives
 
-        for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done
+ALTERNATIVE_PRIORITY = "100"
 
-        for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done
-
-        # Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately.
-        update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10
-        update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10
-        update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
-}
+ALTERNATIVE_${PN} = "lbraket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs}"
 
-pkg_prerm_${PN} () {
-        for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
+ALTERNATIVE_PRIORITY[uptime] = "10"
+ALTERNATIVE_PRIORITY[hostname] = "10"
 
-        for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
+ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/["
+ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}"
 
-        for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done
+python __anonymous() {
+        for prog in d.getVar('base_bindir_progs', True).split():
+                d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog))
 
-        # The special cases
-        update-alternatives --remove hostname hostname.${PN}
-        update-alternatives --remove uptime uptime.${PN}
-        update-alternatives --remove '[' 'lbracket.${PN}'
+        for prog in d.getVar('sbindir_progs', True).split():
+                d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir', True), prog))
 }
 
 BBCLASSEXTEND = "native"