aboutsummaryrefslogtreecommitdiffstats
path: root/recipes
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-10-30 14:58:08 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-10-30 16:02:00 +0200
commit931fb39f49cc32a1fdc87ed934e5d8fda6749f22 (patch)
tree1494aaca831474819607acd25da079f7a5a4a732 /recipes
parenta0830a5e12b914d78e4384d32baeaadf82642dfd (diff)
downloadopenembedded-931fb39f49cc32a1fdc87ed934e5d8fda6749f22.tar.gz
openembedded-931fb39f49cc32a1fdc87ed934e5d8fda6749f22.tar.bz2
openembedded-931fb39f49cc32a1fdc87ed934e5d8fda6749f22.zip
util-linux-ng: Make cal, script, flock use u-a, drop D_P = -1
* cal and script were added to usrbinprogs_a in af3f52db17181108a45a0484a57e84495e865393, but u-a calls weren't added to postinst/prerm * drop D_P = -1, doesn't make much sense in .inc file Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/util-linux-ng/util-linux-ng.inc11
1 files changed, 6 insertions, 5 deletions
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 993742f419..7455098009 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -6,9 +6,7 @@ DEPENDS_virtclass-native = "zlib-native ncurses-native lzo-native gettext-native
inherit autotools gettext
-DEFAULT_PREFERENCE = "-1"
-
-INC_PR = "r32"
+INC_PR = "r33"
# allows for a release candidate
RC ?= ""
@@ -127,7 +125,7 @@ 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 reset cal script"
+ usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt reset cal script flock"
usrsbinprogs_a="readprofile"
binprogs_a="dmesg kill more umount mount login"
@@ -213,6 +211,9 @@ pkg_postinst_${PN} () {
update-alternatives --install ${bindir}/chfn chfn chfn.${PN} 100
update-alternatives --install ${bindir}/newgrp newgrp newgrp.${PN} 100
update-alternatives --install ${bindir}/chsh chsh chsh.${PN} 100
+ update-alternatives --install ${bindir}/cal cal cal.${PN} 100
+ update-alternatives --install ${bindir}/script script script.${PN} 100
+ update-alternatives --install ${bindir}/flock flock flock.${PN} 100
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
@@ -231,7 +232,7 @@ pkg_prerm_${PN} () {
test -x ${base_sbindir}/pivot_root.${PN} && \
update-alternatives --remove pivot_root pivot_root.${PN}
- for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hexdump setsid chrt last logger mesg renice wall vipw vigr chfn newgrp chsh login; do
+ for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hexdump setsid chrt last logger mesg renice wall vipw vigr chfn newgrp chsh login cal script flock; do
update-alternatives --remove $i $i.${PN}
done
}