summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-09-13 08:07:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-17 19:34:55 +0100
commit8dd7ab3a7897fee4733d77d0ff41c88688334fd2 (patch)
tree9e75907a8e7e717f1080e0276d4d62af129cae8b /meta/recipes-core/util-linux
parenta71761e6e6a829f0f3ec08bc52c5b31266823441 (diff)
downloadpoky-8dd7ab3a7897fee4733d77d0ff41c88688334fd2.tar.gz
util-linux: move su to /bin for lsb command check test
In busybox, util-linux and shadow, su has been moved to /usr/bin/, but lsb cmdchk needs su in /bin. Move su to /bin could fix this issue. [YOCTO#5175] (From OE-Core rev: ba84662bd9fb7575e68c87449e986535a2216b30) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 8a14d1688b..15b677015f 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -129,7 +129,7 @@ do_install () {
129 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" 129 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
130 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev" 130 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev"
131 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt" 131 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt"
132 binprogs_a="dmesg kill more umount mount login reset" 132 binprogs_a="dmesg kill more umount mount login reset su"
133 133
134 if [ "${base_sbindir}" != "${sbindir}" ]; then 134 if [ "${base_sbindir}" != "${sbindir}" ]; then
135 mkdir -p ${D}${base_sbindir} 135 mkdir -p ${D}${base_sbindir}
@@ -224,6 +224,6 @@ BBCLASSEXTEND = "native nativesdk"
224python do_package_prepend () { 224python do_package_prepend () {
225 if '--enable-su' in d.getVar('EXTRA_OECONF', True).split(): 225 if '--enable-su' in d.getVar('EXTRA_OECONF', True).split():
226 alt_name = "su" 226 alt_name = "su"
227 d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, '%s/%s' % (d.getVar('bindir', True), alt_name)) 227 d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, '%s/%s' % (d.getVar('base_bindir', True), alt_name))
228 d.appendVar('ALTERNATIVE_%s' % (d.getVar('PN', True)), ' ' + alt_name) 228 d.appendVar('ALTERNATIVE_%s' % (d.getVar('PN', True)), ' ' + alt_name)
229} 229}