Patchwork systemd: Fix packaging of pam config files.

login
register
mail settings
Submitter Florin Sarbu
Date Nov. 15, 2013, 12:10 p.m.
Message ID <1384517411-27854-1-git-send-email-florin.sarbu@windriver.com>
Download mbox | patch
Permalink /patch/61781/
State New
Headers show

Comments

Florin Sarbu - Nov. 15, 2013, 12:10 p.m.
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>
---
 meta/recipes-core/systemd/systemd_208.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Florin Sarbu - Nov. 20, 2013, 10:52 a.m.
Hi,
did anybody have the time to look over this?

Thanks.

On 11/15/2013 02:10 PM, Florin Sarbu wrote:
> 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>
> ---
>   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 8c70fe5..66e6bee 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/"

Patch

diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb
index 8c70fe5..66e6bee 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/"