From e4cead9e97aecdc3d45910aca71eb1d9e9e9a2b6 Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Fri, 15 Nov 2013 14:10:11 +0200 Subject: systemd: Fix packaging of pam config files. Removed early FILES_${PN} += for the pam config files which would subesequently be overwritten by a FILES_${PN} = . Signed-off-by: Florin Sarbu Signed-off-by: Saul Wold --- meta/recipes-core/systemd/systemd_208.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb index 8c70fe507c..66e6beec8a 100644 --- a/meta/recipes-core/systemd/systemd_208.bb +++ b/meta/recipes-core/systemd/systemd_208.bb @@ -160,8 +160,6 @@ FILES_${PN}-kernel-install = "${bindir}/kernel-install \ FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ " -FILES_${PN} += "${@base_contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d', '', d)}" - FILES_${PN}-zsh = "${datadir}/zsh/site-functions" FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ @@ -213,6 +211,7 @@ FILES_${PN} = " ${base_bindir}/* \ /lib/udev/rules.d/71-seat.rules \ /lib/udev/rules.d/73-seat-late.rules \ /lib/udev/rules.d/99-systemd.rules \ + ${@base_contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d', '', d)} \ " FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" -- cgit 1.2.3-korg