[oe-commits] Koen Kooi : util-linux: fix PACKAGECONFIG options

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 8994ff6650a4c4c2f0b07e5ee6a5f889270151e5
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8994ff6650a4c4c2f0b07e5ee6a5f889270151e5

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Thu Jul 25 16:51:28 2013 +0200

util-linux: fix PACKAGECONFIG options

The ??= operator is too weak and it's setting a non-existent PACKAGECONFIG option ('libpam' instead of 'pam').

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-core/util-linux/util-linux.inc |    4 ++--
 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 d373cec..3d1198a 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -47,9 +47,9 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
                 --enable-libuuid --enable-libblkid --enable-fsck --without-udev \
 		usrsbin_execdir='${sbindir}' \
 "
-PACKAGECONFIG_class-target ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \
+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, pam,"
+PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam,"
 
 # Respect the systemd feature for uuidd
 PACKAGECONFIG[systemd] = "--enable-socket-activation --with-systemdsystemunitdir=${systemd_unitdir}/system/, --disable-socket-activation --without-systemdsystemunitdir"