summaryrefslogtreecommitdiffstats
path: root/meta
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:03:28 +0000
commit3a8b73ffb8c8e9309b36dd721b1577dd9e707a1c (patch)
tree3225b3f7a49d8e5c8f1fb749dac85d62cbe6645b /meta
parent27acf4fac6ee4c7e34b3cd4d0e48cdd0f521de6c (diff)
downloadpoky-3a8b73ffb8c8e9309b36dd721b1577dd9e707a1c.tar.gz
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} = . (From OE-Core rev: e4cead9e97aecdc3d45910aca71eb1d9e9e9a2b6) Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 \
160FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ 160FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \
161 " 161 "
162 162
163FILES_${PN} += "${@base_contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d', '', d)}"
164
165FILES_${PN}-zsh = "${datadir}/zsh/site-functions" 163FILES_${PN}-zsh = "${datadir}/zsh/site-functions"
166 164
167FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ 165FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \
@@ -213,6 +211,7 @@ FILES_${PN} = " ${base_bindir}/* \
213 /lib/udev/rules.d/71-seat.rules \ 211 /lib/udev/rules.d/71-seat.rules \
214 /lib/udev/rules.d/73-seat-late.rules \ 212 /lib/udev/rules.d/73-seat-late.rules \
215 /lib/udev/rules.d/99-systemd.rules \ 213 /lib/udev/rules.d/99-systemd.rules \
214 ${@base_contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d', '', d)} \
216 " 215 "
217 216
218FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" 217FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/"