Patchwork [1/8] packagegroup-core-basic: Only build libpam if it's enabled

login
register
mail settings
Submitter Saul Wold
Date July 3, 2013, 10:26 p.m.
Message ID <00bec2da9d29234cce3b6c97076812ea400370fe.1372890071.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/52923/
State Accepted
Commit 8846267bfbcf4158bc4b3fce0d8809913ce4f703
Headers show

Comments

Saul Wold - July 3, 2013, 10:26 p.m.
util-linux will check for the exisitance of pam header files and change what is
built, so only build libpam when pam is enabled for DISTRO_FEATURES

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/packagegroups/packagegroup-core-basic.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Ross Burton - July 4, 2013, 10:37 a.m.
On 3 July 2013 23:26, Saul Wold <sgw@linux.intel.com> wrote:
> util-linux will check for the exisitance of pam header files and change what is
> built, so only build libpam when pam is enabled for DISTRO_FEATURES
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/recipes-extended/packagegroups/packagegroup-core-basic.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
> index c73d173..03dabbf 100644
> --- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
> +++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
> @@ -104,7 +104,7 @@ RDEPENDS_packagegroup-core-multiuser = "\
>      cracklib \
>      gzip \
>      libuser \
> -    libpam \
> +    ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \
>      shadow \
>      sudo \
>      "

Do we even need to mention libpam in here?  If pam is enabled, shadow
will have a runtime dependency on it.

Ross
Otavio Salvador - July 4, 2013, 1:22 p.m.
On Thu, Jul 4, 2013 at 7:37 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 3 July 2013 23:26, Saul Wold <sgw@linux.intel.com> wrote:
>> util-linux will check for the exisitance of pam header files and change what is
>> built, so only build libpam when pam is enabled for DISTRO_FEATURES
>>
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> ---
>>  meta/recipes-extended/packagegroups/packagegroup-core-basic.bb | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
>> index c73d173..03dabbf 100644
>> --- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
>> +++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
>> @@ -104,7 +104,7 @@ RDEPENDS_packagegroup-core-multiuser = "\
>>      cracklib \
>>      gzip \
>>      libuser \
>> -    libpam \
>> +    ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \
>>      shadow \
>>      sudo \
>>      "
>
> Do we even need to mention libpam in here?  If pam is enabled, shadow
> will have a runtime dependency on it.

Agreed :-)

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Patch

diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
index c73d173..03dabbf 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
@@ -104,7 +104,7 @@  RDEPENDS_packagegroup-core-multiuser = "\
     cracklib \
     gzip \
     libuser \
-    libpam \
+    ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \
     shadow \
     sudo \
     "