summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2013-07-25 16:51:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-29 13:09:14 +0100
commit1cbabdbd06fd6c9328c94776df372d26396cf9f9 (patch)
treea40ed6ddf39769289b9730f3e770798723fa8241
parent69119073c0992090c93fe577fbfd10eee36e4540 (diff)
downloadpoky-1cbabdbd06fd6c9328c94776df372d26396cf9f9.tar.gz
util-linux: fix PACKAGECONFIG options
The ??= operator is too weak and it's setting a non-existent PACKAGECONFIG option ('libpam' instead of 'pam'). (From OE-Core rev: 8994ff6650a4c4c2f0b07e5ee6a5f889270151e5) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 d373cecdf0..3d1198ad1d 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 \
47 --enable-libuuid --enable-libblkid --enable-fsck --without-udev \ 47 --enable-libuuid --enable-libblkid --enable-fsck --without-udev \
48 usrsbin_execdir='${sbindir}' \ 48 usrsbin_execdir='${sbindir}' \
49" 49"
50PACKAGECONFIG_class-target ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ 50PACKAGECONFIG_class-target ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
51 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} " 51 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} "
52PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, pam," 52PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam,"
53 53
54# Respect the systemd feature for uuidd 54# Respect the systemd feature for uuidd
55PACKAGECONFIG[systemd] = "--enable-socket-activation --with-systemdsystemunitdir=${systemd_unitdir}/system/, --disable-socket-activation --without-systemdsystemunitdir" 55PACKAGECONFIG[systemd] = "--enable-socket-activation --with-systemdsystemunitdir=${systemd_unitdir}/system/, --disable-socket-activation --without-systemdsystemunitdir"