summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-11-10 15:59:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-15 12:05:27 +0000
commitfa814476fb351120c6ef2fa683a3aa1aa351e2c5 (patch)
tree62b06ccc5f181df85dbab593b8ea79089369e0fd /meta
parentd489592092649f2bc5ec116750f580a66eb741fe (diff)
downloadpoky-fa814476fb351120c6ef2fa683a3aa1aa351e2c5.tar.gz
util-linux: use u-a for flock and blockdev, conflicts with busybox
* nobody replied on http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009409.html * be aware that all those renames to foo.${PN} are also applied for native variants so now we have utils like tmp-eglibc/sysroots/x86_64-linux/usr/bin/flock.util-linux-native which are not used ie in package_ipk.bbclass: package_update_index_ipk because it calls just flock so if that's problem then we should apply those renames only for target version (and live with possible overwrites in -native sysroot) or teach u-a postinst/prerm to happen also for sysroot population (From OE-Core rev: ecebc85df3714f49a6f196655b83a3fde65167ec) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index dcf0ed9431..3b807360f4 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -116,9 +116,9 @@ do_install () {
116 116
117 mkdir -p ${D}${base_bindir} 117 mkdir -p ${D}${base_bindir}
118 118
119 sbinprogs="agetty blockdev ctrlaltdel cfdisk vipw vigr" 119 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
120 sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid sln" 120 sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid sln blockdev"
121 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt" 121 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt flock"
122 binprogs_a="dmesg kill more umount mount login reset" 122 binprogs_a="dmesg kill more umount mount login reset"
123 123
124 if [ "${base_sbindir}" != "${sbindir}" ]; then 124 if [ "${base_sbindir}" != "${sbindir}" ]; then
@@ -180,6 +180,7 @@ pkg_postinst_${PN} () {
180 update-alternatives --install ${base_bindir}/kill kill kill.${PN} 100 180 update-alternatives --install ${base_bindir}/kill kill kill.${PN} 100
181 update-alternatives --install ${base_bindir}/more more more.${PN} 100 181 update-alternatives --install ${base_bindir}/more more more.${PN} 100
182 update-alternatives --install ${base_sbindir}/mkswap mkswap mkswap.${PN} 100 182 update-alternatives --install ${base_sbindir}/mkswap mkswap mkswap.${PN} 100
183 update-alternatives --install ${base_sbindir}/blockdev blockdev blockdev.${PN} 100
183 test -x ${base_sbindir}/pivot_root.${PN} && \ 184 test -x ${base_sbindir}/pivot_root.${PN} && \
184 update-alternatives --install ${base_sbindir}/pivot_root pivot_root pivot_root.${PN} 100 185 update-alternatives --install ${base_sbindir}/pivot_root pivot_root pivot_root.${PN} 100
185# update-alternatives --install ${base_sbindir}/sln sln sln.${PN} 100 186# update-alternatives --install ${base_sbindir}/sln sln sln.${PN} 100
@@ -190,6 +191,7 @@ pkg_postinst_${PN} () {
190 update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 100 191 update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 100
191 update-alternatives --install ${bindir}/renice renice renice.${PN} 100 192 update-alternatives --install ${bindir}/renice renice renice.${PN} 100
192 update-alternatives --install ${bindir}/wall wall wall.${PN} 100 193 update-alternatives --install ${bindir}/wall wall wall.${PN} 100
194 update-alternatives --install ${bindir}/flock flock flock.${PN} 100
193 195
194 # There seems to be problem, atleast on nslu2, with these, untill they are 196 # There seems to be problem, atleast on nslu2, with these, untill they are
195 # fixed the busybox ones have higher priority 197 # fixed the busybox ones have higher priority
@@ -208,6 +210,7 @@ pkg_prerm_${PN} () {
208 update-alternatives --remove halt halt.${PN} 210 update-alternatives --remove halt halt.${PN}
209 update-alternatives --remove hwclock hwclock.${PN} 211 update-alternatives --remove hwclock hwclock.${PN}
210 update-alternatives --remove mkswap mkswap.${PN} 212 update-alternatives --remove mkswap mkswap.${PN}
213 update-alternatives --remove blockdev blockdev.${PN}
211 update-alternatives --remove reboot reboot.${PN} 214 update-alternatives --remove reboot reboot.${PN}
212 update-alternatives --remove shutdown shutdown.${PN} 215 update-alternatives --remove shutdown shutdown.${PN}
213# update-alternatives --remove sln sln.${PN} 216# update-alternatives --remove sln sln.${PN}
@@ -218,6 +221,7 @@ pkg_prerm_${PN} () {
218 update-alternatives --remove mesg mesg.${PN} 221 update-alternatives --remove mesg mesg.${PN}
219 update-alternatives --remove renice renice.${PN} 222 update-alternatives --remove renice renice.${PN}
220 update-alternatives --remove wall wall.${PN} 223 update-alternatives --remove wall wall.${PN}
224 update-alternatives --remove flock flock.${PN}
221} 225}
222 226
223pkg_postinst_util-linux-fdisk () { 227pkg_postinst_util-linux-fdisk () {