summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2010-09-13 12:18:56 +0200
committerEric Bénard <eric@eukrea.com>2010-09-13 12:40:13 +0200
commit506634928d13725b28caf4500316dc5c3da08eda (patch)
treeac114236607f6a49a3bd287fb3a31d36d964386c
parent84bfaa05361391edc6a82acafbb1996c789a3a12 (diff)
downloadopenembedded-506634928d13725b28caf4500316dc5c3da08eda.tar.gz
util-linux-ng: fix reset update-alternative vs busybox
* we actually get the following log : update-alternatives: Error: cannot register alternative reset to /bin/reset since it is already registered to /usr/bin/reset * the fix is to have util-linux-ng install reset in /usr/bin Signed-off-by: Eric Bénard <eric@eukrea.com>
-rw-r--r--recipes/util-linux-ng/util-linux-ng.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index ca0790e11d..577ba50782 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -125,9 +125,9 @@ do_install () {
sbinprogs="agetty blockdev ctrlaltdel cfdisk"
sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid vigr vipw"
- usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt"
+ usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt reset"
usrsbinprogs_a="readprofile"
- binprogs_a="dmesg kill more umount mount login reset"
+ binprogs_a="dmesg kill more umount mount login"
if [ "${base_sbindir}" != "${sbindir}" ]; then
mkdir -p ${D}${base_sbindir}
@@ -214,7 +214,7 @@ pkg_postinst_${PN} () {
update-alternatives --install ${base_bindir}/login login login.${PN} 100
update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 100
update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 100
- update-alternatives --install ${base_bindir}/reset reset reset.${PN} 100
+ update-alternatives --install ${bindir}/reset reset reset.${PN} 100
update-alternatives --install ${bindir}/setsid setsid setsid.${PN} 100
update-alternatives --install ${bindir}/chrt chrt chrt.${PN} 100