]> code.ossystems Code Review - openembedded-core.git/commitdiff
systemd: Fix packaging of pam config files.
authorFlorin Sarbu <florin.sarbu@windriver.com>
Fri, 15 Nov 2013 12:10:11 +0000 (14:10 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 20 Nov 2013 14:02:56 +0000 (14:02 +0000)
Removed early FILES_${PN} += for the pam config
files which would subesequently be overwritten by
a FILES_${PN} = .

Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-core/systemd/systemd_208.bb

index 8c70fe507ca22fd65c742fd88f63941a1f8da276..66e6beec8a2e703550a8b2fe542505148f878ed6 100644 (file)
@@ -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/"