diff options
author | Lu Chong <Chong.Lu@windriver.com> | 2013-11-14 10:47:58 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-20 14:03:26 +0000 |
commit | 182dc38eb525ca9bfabc51d569c65708e1cc17b5 (patch) | |
tree | f44bc8af3c3c6ea81efeb61a431cd88226b7bed7 /meta/recipes-core/util-linux/util-linux.inc | |
parent | bcdda02ab9009a6f8d8c02fdd432161c52824c18 (diff) | |
download | poky-182dc38eb525ca9bfabc51d569c65708e1cc17b5.tar.gz |
util-linux: Fix QA warnings about ALTERNATIVES
Previously, EXTRA_OECONF would be overwritten by EXTRA_OECONF_class-native
and EXTRA_OECONF_class-nativesdk.
As a result, some applications such as `last', `mesg' and `reset' didn't get
compiled.
The patch rewrote EXTRA_OECONF_class-native, EXTRA_OECONF_class-nativesdk
and EXTRA_OECONF variables to fix QA warnings.
usr/share/man/man1/last.1.util-linux does not exist
usr/share/man/man1/mesg.1.util-linux does not exist
usr/bin/last.util-linux does not exist
usr/bin/mesg.util-linux does not exist
bin/reset does not exist
(From OE-Core rev: 4cff0bd254667b145d765e1135f254c1916e2ee8)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
[YOCTO #5338]
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/util-linux.inc')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 15b677015f..94c0ba0940 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -39,15 +39,18 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd | |||
39 | util-linux-mkfs.cramfs util-linux-fsck.cramfs \ | 39 | util-linux-mkfs.cramfs util-linux-fsck.cramfs \ |
40 | util-linux-partx ${PN}-bash-completion" | 40 | util-linux-partx ${PN}-bash-completion" |
41 | 41 | ||
42 | EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ | 42 | SHARED_EXTRA_OECONF = "--disable-use-tty-group \ |
43 | --disable-makeinstall-chown --enable-elvtune --enable-init \ | 43 | --disable-makeinstall-chown --enable-elvtune --enable-init \ |
44 | --enable-kill --enable-last --enable-mesg --enable-partx \ | 44 | --enable-kill --enable-last --enable-mesg --enable-partx \ |
45 | --enable-raw --enable-rdev --enable-reset --disable-login \ | 45 | --enable-raw --enable-rdev --enable-reset --disable-login \ |
46 | --disable-vipw --disable-newgrp --disable-chfn-chsh \ | 46 | --disable-vipw --disable-newgrp --disable-chfn-chsh \ |
47 | --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \ | 47 | --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \ |
48 | --enable-libuuid --enable-libblkid --enable-fsck --without-udev \ | 48 | --enable-libuuid --enable-libblkid --enable-fsck --without-udev \ |
49 | usrsbin_execdir='${sbindir}' \ | 49 | usrsbin_execdir='${sbindir}' \ |
50 | " | 50 | " |
51 | |||
52 | EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" | ||
53 | |||
51 | PACKAGECONFIG_class-target ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ | 54 | PACKAGECONFIG_class-target ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ |
52 | ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} " | 55 | ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} " |
53 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," | 56 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," |