RE: [OE-core] [PATCH 4/4] libcap: add pam_cap license

[Peter Kjellerstedt <peter.kjellerstedt@axis.com>]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Konrad Weihmann
> Sent: den 12 april 2022 09:10
> To: openembedded-core@lists.openembedded.org
> Cc: Konrad Weihmann <kweihmann@outlook.com>
> Subject: [OE-core] [PATCH 4/4] libcap: add pam_cap license
> 
> If libcap is compiled with pam in PACKAGECONFIG
> additional one additional license text becomes effective,
> add that as a conditional
> 
> Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
> ---
>  meta/recipes-support/libcap/libcap_2.63.bb | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-support/libcap/libcap_2.63.bb b/meta/recipes-support/libcap/libcap_2.63.bb
> index f3133f9ded..aed1f0a510 100644
> --- a/meta/recipes-support/libcap/libcap_2.63.bb
> +++ b/meta/recipes-support/libcap/libcap_2.63.bb
> @@ -5,7 +5,11 @@ users, without giving them full root permissions."
>  HOMEPAGE = "http://sites.google.com/site/fullycapable/"
>  # no specific GPL version required
>  LICENSE = "BSD-3-Clause | GPL-2.0-only"
> -LIC_FILES_CHKSUM = "file://License;md5=e2370ba375efe9e1a095c26d37e483b8"
> +LIC_FILES_CHKSUM_PAM = "file://pam_cap/License;md5=0ad4c9c052b9719ee4fce1bfc7c7dee4"
> +LIC_FILES_CHKSUM = "\
> +	file://License;md5=e2370ba375efe9e1a095c26d37e483b8 \
> +	${@oe.utils.ifelse('pam' in (d.getVar('PACKAGECONFIG') or '').split(), '${LIC_FILES_CHKSUM_PAM}', '')} \

This can be simplified to:

	${@bb.utils.contains('PACKAGECONFIG', 'pam', '${LIC_FILES_CHKSUM_PAM}', '', d)} \

> +"

And use four spaces, not tabs, to indent bitbake variables.

> 
>  DEPENDS = "hostperl-runtime-native gperf-native"
> 
> --
> 2.25.1

//Peter