recipes: Use GPL-2.0-only instead of GPL-2.0 for LIC_FILES_CHKSUM
PATCH v2 1/1 recipes: Use GPL-2.0-only instead of GPL-2.0 for LIC_FILES_CHKSUM
---
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(-)
meta/classes/devicetree.bbclass +1 -1
@@ -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"
meta/recipes-connectivity/connman/connman-conf.bb +1 -1
@@ -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
meta/recipes-core/busybox/busybox-inittab_1.32.0.bb +1 -1
@@ -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"
meta/recipes-core/glibc/glibc-collateral.inc +2 -2
@@ -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
meta/recipes-core/systemd/systemd-serialgetty.bb +1 -1
@@ -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"
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +1 -1
@@ -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"
meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +1 -1
@@ -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
Signature · 1 line
2.28.0
Hi Khem,
This patch fixes issues introduced by a patch I tested in -next from Meh Mbeh Ida Delphine <[email protected]> (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
Quoted 132 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>---
v2: Add devicetree.bbclass and glibc-collateral.incmeta/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 ++-(quoted diff) +0
-1- 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(-)meta/classes/devicetree.bbclass +0
-0@@ -18,7 +18,7 @@ SECTION ?= "bsp" # device trees built with them are at least GPLv2 (and in some casesdual
# 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"meta/recipes-connectivity/connman/connman-conf.bb +0
-0@@ -2,7 +2,7 @@ SUMMARY = "Connman config to setup wired interface onqemu 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
meta/recipes-core/busybox/busybox-inittab_1.32.0.bb +0
-1@@ -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"meta/recipes-core/glibc/glibc-collateral.inc +0
-2@@ -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
deltaskdo_unpackmeta/recipes-core/systemd/systemd-serialgetty.bb +0
-1@@ -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"
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +0
-1@@ -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"
(quoted diff) +0
-0scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod- scripts_1.0.bb
index1ab248fed5..8a02bc7f48100644meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +0
-1@@ -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
Quoted 10 lines · Richard Purdie
Hi Khem,
This patch fixes issues introduced by a patch I tested in -next from Meh Mbeh Ida Delphine <[email protected]> (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.
Thanks, other layers also rely on these names. So perhaps this should wait till master opens for next release
and address those layers too.
Quoted 139 lines
Cheers,
Richard
Quoted 132 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>---
v2: Add devicetree.bbclass and glibc-collateral.incmeta/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 ++-(quoted diff) +0
-1- 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(-)meta/classes/devicetree.bbclass +0
-0@@ -18,7 +18,7 @@ SECTION ?= "bsp" # device trees built with them are at least GPLv2 (and in some casesdual
# 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"meta/recipes-connectivity/connman/connman-conf.bb +0
-0@@ -2,7 +2,7 @@ SUMMARY = "Connman config to setup wired interface onqemu 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
meta/recipes-core/busybox/busybox-inittab_1.32.0.bb +0
-1@@ -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"meta/recipes-core/glibc/glibc-collateral.inc +0
-2@@ -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
deltaskdo_unpackmeta/recipes-core/systemd/systemd-serialgetty.bb +0
-1@@ -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"
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +0
-1@@ -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"
(quoted diff) +0
-0scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod- scripts_1.0.bb
index1ab248fed5..8a02bc7f48100644meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +0
-1@@ -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
Hello Meh,
master is now open for next release, can you please send an updated revision of this patch?
Regards,
Quoted 160 lines · Khem Raj
Quoted 10 lines · Richard Purdie
Hi Khem,
This patch fixes issues introduced by a patch I tested in -next from Meh Mbeh Ida Delphine <[email protected]> (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.
Thanks, other layers also rely on these names. So perhaps this should wait till master opens for next release
and address those layers too.Quoted 139 lines
Cheers,
Richard
Quoted 132 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>---
v2: Add devicetree.bbclass and glibc-collateral.incmeta/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 ++-(quoted diff) +0
-1- 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(-)meta/classes/devicetree.bbclass +0
-0@@ -18,7 +18,7 @@ SECTION ?= "bsp" # device trees built with them are at least GPLv2 (and in some casesdual
# 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"meta/recipes-connectivity/connman/connman-conf.bb +0
-0@@ -2,7 +2,7 @@ SUMMARY = "Connman config to setup wired interface onqemu 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
meta/recipes-core/busybox/busybox-inittab_1.32.0.bb +0
-1@@ -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"meta/recipes-core/glibc/glibc-collateral.inc +0
-2@@ -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
deltaskdo_unpackmeta/recipes-core/systemd/systemd-serialgetty.bb +0
-1@@ -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"
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +0
-1@@ -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"
(quoted diff) +0
-0scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod- scripts_1.0.bb
index1ab248fed5..8a02bc7f48100644meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +0
-1@@ -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