From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <Florin.Sarbu@windriver.com>
Received: from mail.windriver.com (mail.windriver.com [147.11.1.11])
	by mail.openembedded.org (Postfix) with ESMTP id D2E0C6C73F
	for <openembedded-core@lists.openembedded.org>;
	Wed, 20 Nov 2013 10:52:00 +0000 (UTC)
Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com
	[147.11.189.40])
	by mail.windriver.com (8.14.5/8.14.5) with ESMTP id rAKAq2To002436
	(version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL)
	for <openembedded-core@lists.openembedded.org>;
	Wed, 20 Nov 2013 02:52:02 -0800 (PST)
Received: from localhost.localdomain (128.224.174.81) by
	ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id
	14.2.347.0; Wed, 20 Nov 2013 02:52:02 -0800
Message-ID: <528C9451.3030703@windriver.com>
Date: Wed, 20 Nov 2013 12:52:01 +0200
From: Florin Sarbu <florin.sarbu@windriver.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:24.0) Gecko/20100101 Thunderbird/24.1.0
MIME-Version: 1.0
To: <openembedded-core@lists.openembedded.org>
References: <1384517411-27854-1-git-send-email-florin.sarbu@windriver.com>
In-Reply-To: <1384517411-27854-1-git-send-email-florin.sarbu@windriver.com>
Subject: Re: [PATCH] systemd: Fix packaging of pam config files.
X-BeenThere: openembedded-core@lists.openembedded.org
X-Mailman-Version: 2.1.12
Precedence: list
List-Id: Patches and discussions about the oe-core layer
	<openembedded-core.lists.openembedded.org>
List-Unsubscribe: <http://lists.openembedded.org/mailman/options/openembedded-core>,
	<mailto:openembedded-core-request@lists.openembedded.org?subject=unsubscribe>
List-Archive: <http://lists.openembedded.org/pipermail/openembedded-core/>
List-Post: <mailto:openembedded-core@lists.openembedded.org>
List-Help: <mailto:openembedded-core-request@lists.openembedded.org?subject=help>
List-Subscribe: <http://lists.openembedded.org/mailman/listinfo/openembedded-core>,
	<mailto:openembedded-core-request@lists.openembedded.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Nov 2013 10:52:01 -0000
Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
Content-Transfer-Encoding: 7bit

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/"