[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7962/8267] systemd: add runtime dependencies to pam plugins.

[Emmanuele Bassi <ebassi src gnome org>]

commit 31fb57d72deca73aaf66dd6416defb70fe97ee24
Author: andreas kling peiker-cee de <andreas kling peiker-cee de>
Date:   Wed Sep 27 11:40:14 2017 +0200

    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>

 meta/recipes-core/systemd/systemd_234.bb |    9 +++++++--
 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 881896b..acc4c46 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -31,6 +31,12 @@ SRC_URI += " \
            "
 SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"
 
+PAM_PLUGINS = " \
+    pam-plugin-unix \
+    pam-plugin-loginuid \
+    pam-plugin-keyinit \
+"
+
 PACKAGECONFIG ??= "xz \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux ldconfig usrmerge', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
@@ -100,7 +106,7 @@ PACKAGECONFIG[importd] = "--enable-importd,--disable-importd"
 PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn"
 PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit"
 PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native 
docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
-PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam"
+PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}"
 # Verify keymaps on locale change
 PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
 # Update NAT firewall rules
@@ -295,7 +301,6 @@ PACKAGES =+ "\
     ${PN}-kernel-install \
     ${PN}-rpm-macros \
     ${PN}-binfmt \
-    ${PN}-pam \
     ${PN}-zsh-completion \
     ${PN}-xorg-xinitrc \
     ${PN}-container \