diff options
-rw-r--r-- | 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 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 | " |
32 | SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" | 32 | SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" |
33 | 33 | ||
34 | PAM_PLUGINS = " \ | ||
35 | pam-plugin-unix \ | ||
36 | pam-plugin-loginuid \ | ||
37 | pam-plugin-keyinit \ | ||
38 | " | ||
39 | |||
34 | PACKAGECONFIG ??= "xz \ | 40 | PACKAGECONFIG ??= "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" | |||
100 | PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" | 106 | PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" |
101 | PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit" | 107 | PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit" |
102 | PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" | 108 | PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" |
103 | PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam" | 109 | PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}" |
104 | # Verify keymaps on locale change | 110 | # Verify keymaps on locale change |
105 | PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" | 111 | PACKAGECONFIG[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 \ |