From: Andy Kling <[email protected]> move pam related files to already existing systemd-pam package. add runtime dependencies to pam plugins introduced by file systemd-user.
Signed-off-by: Andy Kling <[email protected]> --- meta/recipes-core/systemd/systemd_234.bb | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb index 2695e15ac6..fa16807406 100644 --- a/meta/recipes-core/systemd/systemd_234.bb +++ b/meta/recipes-core/systemd/systemd_234.bb @@ -100,7 +100,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,${PN}-pam" # Verify keymaps on locale change PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" # Update NAT firewall rules @@ -434,6 +434,17 @@ FILES_${PN}-extra-utils = "\ ${rootlibexecdir}/systemd/systemd-cgroups-agent \ " +RDEPENDS_${PN}-pam += " \ + pam-plugin-unix \ + pam-plugin-loginuid \ + pam-plugin-keyinit \ +" + +FILES_${PN}-pam = " \ + ${sysconfdir}/pam.d/ \ + ${base_libdir}/security/*.so \ +" + CONFFILES_${PN} = "${sysconfdir}/machine-id \ ${sysconfdir}/systemd/coredump.conf \ ${sysconfdir}/systemd/journald.conf \ @@ -450,7 +461,6 @@ FILES_${PN} = " ${base_bindir}/* \ ${sysconfdir}/dbus-1/ \ ${sysconfdir}/machine-id \ ${sysconfdir}/modules-load.d/ \ - ${sysconfdir}/pam.d/ \ ${sysconfdir}/sysctl.d/ \ ${sysconfdir}/systemd/ \ ${sysconfdir}/tmpfiles.d/ \ @@ -459,7 +469,6 @@ FILES_${PN} = " ${base_bindir}/* \ ${sysconfdir}/resolv-conf.systemd \ ${rootlibexecdir}/systemd/* \ ${systemd_unitdir}/* \ - ${base_libdir}/security/*.so \ /cgroup \ ${bindir}/systemd* \ ${bindir}/busctl \ -- 2.14.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
