summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Sarbu <florin.sarbu@windriver.com>2013-11-15 14:10:11 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-20 14:02:56 +0000
commite4cead9e97aecdc3d45910aca71eb1d9e9e9a2b6 (patch)
treeafcb6cd794ec87b5cfd6da89c07043272d1c88c3
parentd573d424788d56c6fee02c1ee0cdeb96fe610b85 (diff)
downloadopenembedded-core-contrib-e4cead9e97aecdc3d45910aca71eb1d9e9e9a2b6.tar.gz
openembedded-core-contrib-e4cead9e97aecdc3d45910aca71eb1d9e9e9a2b6.tar.bz2
openembedded-core-contrib-e4cead9e97aecdc3d45910aca71eb1d9e9e9a2b6.zip
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 <florin.sarbu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-core/systemd/systemd_208.bb3
1 files changed, 1 insertions, 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/"