summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas.kling@peiker-cee.de <andreas.kling@peiker-cee.de>2017-09-27 11:40:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-07 23:20:39 +0100
commit31fb57d72deca73aaf66dd6416defb70fe97ee24 (patch)
tree20af212799030bfc955d92d11ea9b3db39a2942c
parentedb4d9984b79bca3ad5d000aa563ebcc2e5740d4 (diff)
downloadpoky-31fb57d72deca73aaf66dd6416defb70fe97ee24.tar.gz
systemd: add runtime dependencies to pam plugins.
(From OE-Core rev: e1bbca2b6d2edbea0939cbeafe6e74c1d4c59a25) Signed-off-by: Andy Kling <andreas.kling@peiker-cee.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_234.bb9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index 881896bfb5..acc4c4623b 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -31,6 +31,12 @@ SRC_URI += " \
31 " 31 "
32SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" 32SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"
33 33
34PAM_PLUGINS = " \
35 pam-plugin-unix \
36 pam-plugin-loginuid \
37 pam-plugin-keyinit \
38"
39
34PACKAGECONFIG ??= "xz \ 40PACKAGECONFIG ??= "xz \
35 ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux ldconfig usrmerge', d)} \ 41 ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux ldconfig usrmerge', d)} \
36 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ 42 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
@@ -100,7 +106,7 @@ PACKAGECONFIG[importd] = "--enable-importd,--disable-importd"
100PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" 106PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn"
101PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit" 107PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit"
102PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" 108PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
103PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam" 109PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}"
104# Verify keymaps on locale change 110# Verify keymaps on locale change
105PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" 111PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
106# Update NAT firewall rules 112# Update NAT firewall rules
@@ -295,7 +301,6 @@ PACKAGES =+ "\
295 ${PN}-kernel-install \ 301 ${PN}-kernel-install \
296 ${PN}-rpm-macros \ 302 ${PN}-rpm-macros \
297 ${PN}-binfmt \ 303 ${PN}-binfmt \
298 ${PN}-pam \
299 ${PN}-zsh-completion \ 304 ${PN}-zsh-completion \
300 ${PN}-xorg-xinitrc \ 305 ${PN}-xorg-xinitrc \
301 ${PN}-container \ 306 ${PN}-container \