[meta-networking,1/2] samba,arptables,ncp: Use new license names in LIC_FILES_CHKSUM

Submitted by Khem Raj on Oct. 16, 2020, 2:22 a.m. | Patch ID: 177274

Details

Message ID 20201016022206.489864-1-raj.khem@gmail.com
State Deferred
Headers show

Commit Message

Khem Raj Oct. 16, 2020, 2:22 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 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(-)

Patch hide | download patch | download mbox

diff --git a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
index b5085c913b..cfbb113c7f 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
@@ -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 += "\
diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb
index c02a19944d..5afec7663a 100644
--- a/meta-networking/recipes-support/arptables/arptables_git.bb
+++ b/meta-networking/recipes-support/arptables/arptables_git.bb
@@ -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}"
 
diff --git a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
index f42223b1f8..a2f0ccc069 100644
--- a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
+++ b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
@@ -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"

Comments

Peter Kjellerstedt Oct. 16, 2020, 4:51 p.m.
> -----Original Message-----
> From: openembedded-devel@lists.openembedded.org <openembedded-
> devel@lists.openembedded.org> On Behalf Of Khem Raj
> Sent: den 16 oktober 2020 04:22
> To: openembedded-devel@lists.openembedded.org
> Cc: Khem Raj <raj.khem@gmail.com>
> Subject: [oe] [meta-networking][PATCH 1/2] samba,arptables,ncp: Use new license names in LIC_FILES_CHKSUM
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  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(-)
> 
> diff --git a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
> index b5085c913b..cfbb113c7f 100644
> --- a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
> +++ b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
> @@ -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

> 
>  SAMBA_MIRROR = "http://samba.org/samba/ftp"
>  MIRRORS += "\
> diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb
> index c02a19944d..5afec7663a 100644
> --- a/meta-networking/recipes-support/arptables/arptables_git.bb
> +++ b/meta-networking/recipes-support/arptables/arptables_git.bb
> @@ -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}"
> 
> diff --git a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> index f42223b1f8..a2f0ccc069 100644
> --- a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> +++ b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> @@ -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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#87555): https://lists.openembedded.org/g/openembedded-devel/message/87555
Mute This Topic: https://lists.openembedded.org/mt/77543105/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Khem Raj Oct. 16, 2020, 4:55 p.m.
On Fri, Oct 16, 2020 at 9:51 AM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> > -----Original Message-----
> > From: openembedded-devel@lists.openembedded.org <openembedded-
> > devel@lists.openembedded.org> On Behalf Of Khem Raj
> > Sent: den 16 oktober 2020 04:22
> > To: openembedded-devel@lists.openembedded.org
> > Cc: Khem Raj <raj.khem@gmail.com>
> > Subject: [oe] [meta-networking][PATCH 1/2] samba,arptables,ncp: Use new license names in LIC_FILES_CHKSUM
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  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(-)
> >
> > diff --git a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
> > index b5085c913b..cfbb113c7f 100644
> > --- a/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
> > +++ b/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb
> > @@ -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...

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

>
> //Peter
>
> >
> >  SAMBA_MIRROR = "http://samba.org/samba/ftp"
> >  MIRRORS += "\
> > diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb
> > index c02a19944d..5afec7663a 100644
> > --- a/meta-networking/recipes-support/arptables/arptables_git.bb
> > +++ b/meta-networking/recipes-support/arptables/arptables_git.bb
> > @@ -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}"
> >
> > diff --git a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> > index f42223b1f8..a2f0ccc069 100644
> > --- a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> > +++ b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> > @@ -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
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#87557): https://lists.openembedded.org/g/openembedded-devel/message/87557
Mute This Topic: https://lists.openembedded.org/mt/77543105/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-