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:02:54 +0000 |
| commit | 4cff0bd254667b145d765e1135f254c1916e2ee8 (patch) | |
| tree | 636eeac5e5ca6e39993fb64ff593b7da80a2a339 /meta/recipes-core/util-linux | |
| parent | 014f7a33f399192268f28acac835551413c4768d (diff) | |
| download | openembedded-core-contrib-4cff0bd254667b145d765e1135f254c1916e2ee8.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
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
[YOCTO #5338]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/util-linux')
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 19 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.23.2.bb | 8 |
2 files changed, 17 insertions, 10 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 15b677015f1..94c0ba0940b 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 util-linux-mkfs.cramfs util-linux-fsck.cramfs \ util-linux-partx ${PN}-bash-completion" -EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ - --disable-makeinstall-chown --enable-elvtune --enable-init \ - --enable-kill --enable-last --enable-mesg --enable-partx \ - --enable-raw --enable-rdev --enable-reset --disable-login \ - --disable-vipw --disable-newgrp --disable-chfn-chsh \ - --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \ - --enable-libuuid --enable-libblkid --enable-fsck --without-udev \ - usrsbin_execdir='${sbindir}' \ +SHARED_EXTRA_OECONF = "--disable-use-tty-group \ + --disable-makeinstall-chown --enable-elvtune --enable-init \ + --enable-kill --enable-last --enable-mesg --enable-partx \ + --enable-raw --enable-rdev --enable-reset --disable-login \ + --disable-vipw --disable-newgrp --disable-chfn-chsh \ + --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \ + --enable-libuuid --enable-libblkid --enable-fsck --without-udev \ + usrsbin_execdir='${sbindir}' \ " + +EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" + PACKAGECONFIG_class-target ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} " PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," diff --git a/meta/recipes-core/util-linux/util-linux_2.23.2.bb b/meta/recipes-core/util-linux/util-linux_2.23.2.bb index b5c221bb4bd..f65932cb200 100644 --- a/meta/recipes-core/util-linux/util-linux_2.23.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.23.2.bb @@ -18,5 +18,9 @@ SRC_URI[md5sum] = "39a02ad0b3b37824c394f40930b7aa38" SRC_URI[sha256sum] = "6c5be3f7beec91b4893de14bbd722886fa2521be5bfa0fc079b749d0018633b1" CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" -EXTRA_OECONF_class-native += "--disable-fallocate --disable-use-tty-group" -EXTRA_OECONF_class-nativesdk += "--disable-fallocate --disable-use-tty-group" +EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \ + --disable-fallocate --disable-use-tty-group \ +" +EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF} \ + --disable-fallocate --disable-use-tty-group \ +" |