From: "Richard Purdie" <richard.purdie@linuxfoundation.org>
To: Khem Raj <raj.khem@gmail.com>, openembedded-core@lists.openembedded.org
Cc: Meh Mbeh Ida Delphine <idadelm@gmail.com>
Subject: Re: [OE-core] [PATCH v2] recipes: Use GPL-2.0-only instead of GPL-2.0 for LIC_FILES_CHKSUM
Date: Fri, 16 Oct 2020 10:05:18 +0100 [thread overview]
Message-ID: <c671f8ca6bdeb7d7475dbfea8ec440d103045395.camel@linuxfoundation.org> (raw)
In-Reply-To: <20201016043341.635385-1-raj.khem@gmail.com>
Hi Khem,
This patch fixes issues introduced by a patch I tested in -next from
Meh Mbeh Ida Delphine <idadelm@gmail.com> (cc'd). I have removed it
from the queue as it failed testing. This patch may be useful so they
can fix their patch though.
Note the fixes Khem found for glibc-collateral and devicetree.bbclass
in addition to the recipes.
Cheers,
Richard
On Thu, 2020-10-15 at 21:33 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> v2: Add devicetree.bbclass and glibc-collateral.inc
>
> meta/classes/devicetree.bbclass | 2 +-
> meta/recipes-connectivity/connman/connman-conf.bb | 2 +-
> meta/recipes-core/busybox/busybox-inittab_1.32.0.bb | 2 +-
> meta/recipes-core/glibc/glibc-collateral.inc | 4 ++-
> -
> meta/recipes-core/systemd/systemd-serialgetty.bb | 2 +-
> meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 2 +-
> meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb | 2 +-
> 7 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/meta/classes/devicetree.bbclass
> b/meta/classes/devicetree.bbclass
> index c772ab2ab9..ece883accf 100644
> --- a/meta/classes/devicetree.bbclass
> +++ b/meta/classes/devicetree.bbclass
> @@ -18,7 +18,7 @@ SECTION ?= "bsp"
> # device trees built with them are at least GPLv2 (and in some cases
> dual
> # licensed). Default to GPLv2 if the recipe does not specify a
> license.
> LICENSE ?= "GPLv2"
> -LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-
> 2.0;md5=801f80980d171dd6425610833a22dbe6"
> +LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-
> only;md5=801f80980d171dd6425610833a22dbe6"
>
> INHIBIT_DEFAULT_DEPS = "1"
> DEPENDS += "dtc-native"
> diff --git a/meta/recipes-connectivity/connman/connman-conf.bb
> b/meta/recipes-connectivity/connman/connman-conf.bb
> index 9a519ec866..85fee09258 100644
> --- a/meta/recipes-connectivity/connman/connman-conf.bb
> +++ b/meta/recipes-connectivity/connman/connman-conf.bb
> @@ -2,7 +2,7 @@ SUMMARY = "Connman config to setup wired interface on
> qemu machines"
> DESCRIPTION = "This is the ConnMan configuration to set up a Wired \
> network interface for a qemu machine."
> LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
>
> inherit systemd
>
> diff --git a/meta/recipes-core/busybox/busybox-inittab_1.32.0.bb
> b/meta/recipes-core/busybox/busybox-inittab_1.32.0.bb
> index 61fb8cbad1..2129acd8d3 100644
> --- a/meta/recipes-core/busybox/busybox-inittab_1.32.0.bb
> +++ b/meta/recipes-core/busybox/busybox-inittab_1.32.0.bb
> @@ -1,6 +1,6 @@
> SUMMARY = "inittab configuration for BusyBox"
> LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
>
> SRC_URI = "file://inittab"
>
> diff --git a/meta/recipes-core/glibc/glibc-collateral.inc
> b/meta/recipes-core/glibc/glibc-collateral.inc
> index 52880791a7..4f81f07da7 100644
> --- a/meta/recipes-core/glibc/glibc-collateral.inc
> +++ b/meta/recipes-core/glibc/glibc-collateral.inc
> @@ -1,7 +1,7 @@
> require glibc-common.inc
>
> -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-
> 2.0;md5=801f80980d171dd6425610833a22dbe6 \
> - file://${COMMON_LICENSE_DIR}/LGPL-
> 2.1;md5=1a6d268fd218675ffea8be556788b780"
> +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-
> only;md5=801f80980d171dd6425610833a22dbe6 \
> + file://${COMMON_LICENSE_DIR}/LGPL-2.1-
> only;md5=1a6d268fd218675ffea8be556788b780"
>
> deltask do_fetch
> deltask do_unpack
> diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb
> b/meta/recipes-core/systemd/systemd-serialgetty.bb
> index 0cc0dc8c79..9a63c9f0a8 100644
> --- a/meta/recipes-core/systemd/systemd-serialgetty.bb
> +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
> @@ -1,7 +1,7 @@
> SUMMARY = "Serial terminal support for systemd"
> HOMEPAGE = "https://www.freedesktop.org/wiki/Software/systemd/"
> LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
>
> PR = "r5"
>
> diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> index 8781492d47..d95d1a63f5 100644
> --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> @@ -1,6 +1,6 @@
> SUMMARY = "Inittab configuration for SysVinit"
> LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
>
> PR = "r10"
>
> diff --git a/meta/recipes-kernel/make-mod-scripts/make-mod-
> scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod-
> scripts_1.0.bb
> index 1ab248fed5..8a02bc7f48 100644
> --- a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
> +++ b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
> @@ -1,6 +1,6 @@
> SUMMARY = "Build tools needed by external modules"
> LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
>
> inherit kernel-arch
> inherit pkgconfig
>
>
next prev parent reply other threads:[~2020-10-16 9:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-16 4:33 [PATCH v2] recipes: Use GPL-2.0-only instead of GPL-2.0 for LIC_FILES_CHKSUM Khem Raj
2020-10-16 9:05 ` Richard Purdie [this message]
2020-10-16 18:47 ` [OE-core] " Khem Raj
2020-11-17 16:36 ` Martin Jansa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c671f8ca6bdeb7d7475dbfea8ec440d103045395.camel@linuxfoundation.org \
--to=richard.purdie@linuxfoundation.org \
--cc=idadelm@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=raj.khem@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox