diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-02-27 14:02:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 11:17:45 +0000 |
commit | 254bfb107134702d8d1e0bfbdd1b011212e8c291 (patch) | |
tree | 188ddf3ea786bc1b913904330e4f95125bd6def4 /meta/recipes-core/util-linux | |
parent | dec5650bc292aa3c4a0a04ace72d2cf762e9620b (diff) | |
download | poky-254bfb107134702d8d1e0bfbdd1b011212e8c291.tar.gz |
recipes: Make use of the new bb.utils.filter() function
(From OE-Core rev: 0a1427bf9aeeda6bee2cc0af8da4ea5fd90aef6f)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.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.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 7d948bfda6..821f7c8751 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -52,7 +52,7 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \ | |||
52 | 52 | ||
53 | EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" | 53 | EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" |
54 | 54 | ||
55 | PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" | 55 | PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" |
56 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," | 56 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," |
57 | 57 | ||
58 | # Respect the systemd feature for uuidd | 58 | # Respect the systemd feature for uuidd |
@@ -177,7 +177,7 @@ do_install () { | |||
177 | 177 | ||
178 | rm -f ${D}${bindir}/chkdupexe | 178 | rm -f ${D}${bindir}/chkdupexe |
179 | 179 | ||
180 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then | 180 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
181 | install -d ${D}${sysconfdir}/pam.d | 181 | install -d ${D}${sysconfdir}/pam.d |
182 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser | 182 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser |
183 | install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l | 183 | install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l |