[PATCH 2/4] gmp: add missing COPYINGv3

[PATCH 2/4] gmp: add missing COPYINGv3

[Konrad Weihmann]

add COPYINGv3 license text to LIC_FILES_CHKSUM

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
---
 meta/recipes-support/gmp/gmp_6.2.1.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-support/gmp/gmp_6.2.1.bb b/meta/recipes-support/gmp/gmp_6.2.1.bb
index 72fbf4eefe..29055492c2 100644
--- a/meta/recipes-support/gmp/gmp_6.2.1.bb
+++ b/meta/recipes-support/gmp/gmp_6.2.1.bb
@@ -2,9 +2,11 @@ require gmp.inc
 
 LICENSE = "GPL-2.0-or-later | LGPL-3.0-or-later"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                   file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
-                   file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+LIC_FILES_CHKSUM = "\
+        file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+        file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
+        file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+        file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \
 "
 
 REVISION = ""
-- 
2.25.1

[PATCH 3/4] itstool: add missing COPYING.GPL3

[Konrad Weihmann]

to LIC_FILES_CHKSUM.
Format the list for better readability.
Remove useless line continuation from SRC_URI

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
---
 meta/recipes-support/itstool/itstool_2.0.7.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-support/itstool/itstool_2.0.7.bb b/meta/recipes-support/itstool/itstool_2.0.7.bb
index 5af16995d7..7af231b1f2 100644
--- a/meta/recipes-support/itstool/itstool_2.0.7.bb
+++ b/meta/recipes-support/itstool/itstool_2.0.7.bb
@@ -5,14 +5,16 @@ XML files. It determines what to translate and how to chunk it into \
 messages using the W3C Internationalization Tag Set (ITS). "
 HOMEPAGE = "http://itstool.org/"
 LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59c57b95fd7d0e9e238ebbc7ad47c5a5"
+LIC_FILES_CHKSUM = "\
+    file://COPYING;md5=59c57b95fd7d0e9e238ebbc7ad47c5a5 \
+    file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+"
 
 inherit autotools python3native
 
 DEPENDS = "libxml2-native"
 
-SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2 \
-           "
+SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2"
 SRC_URI:append:class-native = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch"
 SRC_URI:append:class-nativesdk = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch"
 SRC_URI:append:class-target = " file://0002-Don-t-use-build-time-hardcoded-python-binary-path.patch"
-- 
2.25.1

[PATCH 4/4] libcap: add pam_cap license

[Konrad Weihmann]

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}', '')} \
+"
 
 DEPENDS = "hostperl-runtime-native gperf-native"
 
-- 
2.25.1

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

[Peter Kjellerstedt]

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