Skip to contentSkip to conversation

samba,arptables,ncp: Use new license names in LIC_FILES_CHKSUM

PATCH In review Khem Raj 2 participants 4 messages Oct 16, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 samba,arptables,ncp: Use new license names in LIC_FILES_CHKSUM

---
 meta-networking/recipes-connectivity/samba/samba_4.10.18.bb | 4 ++--
 meta-networking/recipes-support/arptables/arptables_git.bb  | 2 +-
 meta-networking/recipes-support/ncp/ncp_1.2.4.bb            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.10.18.bb +2 -2
index b5085c913b..cfbb113c7f 100644
@@ -3,8 +3,8 @@ SECTION = "console/network"
 
 LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
-                    file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 "
+                    file://${COREBASE}/meta/files/common-licenses/LGPL-3.0-only;md5=bfccfe952269fff2b407dd11f2f3083b \
+                    file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
 SAMBA_MIRROR = "http://samba.org/samba/ftp"
 MIRRORS += "\
meta-networking/recipes-support/arptables/arptables_git.bb +1 -1
index c02a19944d..5afec7663a 100644
@@ -1,7 +1,7 @@
 SUMMARY = "Administration tool for arp packet filtering"
 SECTION = "net"
 LICENSE = "GPL-2.0"
-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"
 SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a"
 PV = "0.0.5+git${SRCPV}"
 
meta-networking/recipes-support/ncp/ncp_1.2.4.bb +1 -1
index f42223b1f8..a2f0ccc069 100644
@@ -4,7 +4,7 @@ security or integrity checking, no throttling, no features, except \
 one: you don't have to type the coordinates of your peer."
 HOMEPAGE = "http://www.fefe.de/ncp"
 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"
 DEPENDS = "libowfat"
 
 SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2"
Signature · 1 line
2.28.0
author
#1 lore raw

PATCH 2/2 gnome-doc-utils-stub: Use new license names in LIC_FILES_CHKSUM

---
 .../gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb +2 -2
index d6da51b0de..f7fbedd6e0 100644
@@ -3,8 +3,8 @@ DESCRIPTION = "This recipe provides m4 macros from gnome-doc-utils project, so \
 that dependent recipes can build. Gnome-doc-utils itself is no longer packaged because \
 it requires libxml2 and python 2 at the same time, which can no longer be satisfied. "
 LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
-                    file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \
+                    file://${COREBASE}/meta/files/common-licenses/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780"
 SRC_URI = "file://gnome-doc-utils.m4"
 
 PROVIDES = "gnome-doc-utils"
Signature · 1 line
2.28.0
#2 lore raw
In reply to Khem Raj
Quoted 20 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Khem Raj
Sent: den 16 oktober 2020 04:22
To: [email protected]
Cc: Khem Raj <[email protected]>
Subject: [oe] [meta-networking][PATCH 1/2] samba,arptables,ncp: Use new license names in LIC_FILES_CHKSUM

---
 meta-networking/recipes-connectivity/samba/samba_4.10.18.bb | 4 ++--
 meta-networking/recipes-support/arptables/arptables_git.bb  | 2 +-
 meta-networking/recipes-support/ncp/ncp_1.2.4.bb            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.10.18.bb +0 -0
index b5085c913b..cfbb113c7f 100644

meta-networking/recipes-connectivity/samba/samba_4.10.18.bb SECTION = "console/network" · line 7

Quoted 7 lines
meta-networking/recipes-connectivity/samba/samba_4.10.18.bb +2 -2
@@ -3,8 +3,8 @@ SECTION = "console/network"
 
 LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
-                    file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 "
+                    file://${COREBASE}/meta/files/common-licenses/LGPL-3.0-only;md5=bfccfe952269fff2b407dd11f2f3083b \
+                    file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"

Based on LICENSE above, that should rather be LGPL-3.0-or-later and GPL-2.0-or-later. The same also applies to libconfig-autoconf-perl, libfile-slurper-perl, libunix-statgrab and libtest-warnings-perl that you also sent patches for. That of course assumes those license files are added first...

//Peter

Quoted 31 lines
meta-networking/recipes-connectivity/samba/samba_4.10.18.bb +0 -0
 SAMBA_MIRROR = "http://samba.org/samba/ftp"
 MIRRORS += "\
meta-networking/recipes-support/arptables/arptables_git.bb +1 -1
index c02a19944d..5afec7663a 100644
@@ -1,7 +1,7 @@
 SUMMARY = "Administration tool for arp packet filtering"
 SECTION = "net"
 LICENSE = "GPL-2.0"
-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"
 SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a"
 PV = "0.0.5+git${SRCPV}"
 
meta-networking/recipes-support/ncp/ncp_1.2.4.bb +1 -2
index f42223b1f8..a2f0ccc069 100644
@@ -4,7 +4,7 @@ security or integrity checking, no throttling, no features, except \
 one: you don't have to type the coordinates of your peer."
 HOMEPAGE = "http://www.fefe.de/ncp"
 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"
 DEPENDS = "libowfat"
 
 SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2"
--

2.28.0

author
#3 lore raw
Quoted 22 lines · Peter Kjellerstedt
Quoted 22 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Khem Raj
Sent: den 16 oktober 2020 04:22
To: [email protected]
Cc: Khem Raj <[email protected]>
Subject: [oe] [meta-networking][PATCH 1/2] samba,arptables,ncp: Use new license names in LIC_FILES_CHKSUM

---
 meta-networking/recipes-connectivity/samba/samba_4.10.18.bb | 4 ++--
 meta-networking/recipes-support/arptables/arptables_git.bb  | 2 +-
 meta-networking/recipes-support/ncp/ncp_1.2.4.bb            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.10.18.bb +0 -0
index b5085c913b..cfbb113c7f 100644
@@ -3,8 +3,8 @@ SECTION = "console/network"
 
Quoted 12 lines

meta-networking/recipes-connectivity/samba/samba_4.10.18.bb SECTION = "console/network" · line 7

Quoted 6 lines
meta-networking/recipes-connectivity/samba/samba_4.10.18.bb +2 -2
 LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
-                    file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 "
+                    file://${COREBASE}/meta/files/common-licenses/LGPL-3.0-only;md5=bfccfe952269fff2b407dd11f2f3083b \
+                    file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"

Based on LICENSE above, that should rather be LGPL-3.0-or-later and GPL-2.0-or-later. The same also applies to libconfig-autoconf-perl, libfile-slurper-perl, libunix-statgrab and libtest-warnings-perl that you also sent patches for. That of course assumes those license files are added first...

right, I was just keeping is bug compatible. I think the patch to rename these files in core perhaps should include these additional files ofcourse if these
are specified by SPDX. For now these patches can be ignored. perhaps once master is open for 3.3 we can redo them

Quoted 35 lines

//Peter

Quoted 31 lines
meta-networking/recipes-connectivity/samba/samba_4.10.18.bb +0 -0
 SAMBA_MIRROR = "http://samba.org/samba/ftp"
 MIRRORS += "\
meta-networking/recipes-support/arptables/arptables_git.bb +1 -1
index c02a19944d..5afec7663a 100644
@@ -1,7 +1,7 @@
 SUMMARY = "Administration tool for arp packet filtering"
 SECTION = "net"
 LICENSE = "GPL-2.0"
-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"
 SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a"
 PV = "0.0.5+git${SRCPV}"
 
meta-networking/recipes-support/ncp/ncp_1.2.4.bb +1 -2
index f42223b1f8..a2f0ccc069 100644
@@ -4,7 +4,7 @@ security or integrity checking, no throttling, no features, except \
 one: you don't have to type the coordinates of your peer."
 HOMEPAGE = "http://www.fefe.de/ncp"
 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"
 DEPENDS = "libowfat"
 
 SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2"
--

2.28.0