diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2022-02-27 19:21:36 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-01 23:44:29 +0000 |
commit | 165759dced7fbe73b1db2ede67047896071dc6d0 (patch) | |
tree | 599825887e963b2595fc7f64b7e9c2edbc4ad476 /meta/recipes-extended | |
parent | e7df51f8d2361e9fe2d67669d2e17f0a5d01004e (diff) | |
download | openembedded-core-contrib-165759dced7fbe73b1db2ede67047896071dc6d0.tar.gz |
meta, meta-selftest: Replace more non-SPDX license identifiers
In commit ceda3238 (meta/meta-selftest/meta-skeleton: Update LICENSE
variable to use SPDX license identifiers) all LICENSE variables were
updated to only use SPDX license identifiers.
This does the same for comments and other variables where it is
appropriate to use the official SPDX license identifiers. There are
still references to, e.g., "GPLv3", but they are then typically in
descriptive text where they refer to the license in a generic sense.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/bash/bash_5.1.16.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/findutils/findutils_4.9.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/gawk/gawk_5.1.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip.inc | 1 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip_1.11.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/less/less_600.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/mdadm/mdadm_4.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.5.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/xz/xz_5.2.5.bb | 9 |
9 files changed, 14 insertions, 12 deletions
diff --git a/meta/recipes-extended/bash/bash_5.1.16.bb b/meta/recipes-extended/bash/bash_5.1.16.bb index 45c7c2b09c..d046faa4e5 100644 --- a/meta/recipes-extended/bash/bash_5.1.16.bb +++ b/meta/recipes-extended/bash/bash_5.1.16.bb @@ -1,6 +1,6 @@ require bash.inc -# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) +# GPL-2.0-or-later (< 4.0), GPL-3.0-or-later (>= 4.0) LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" diff --git a/meta/recipes-extended/findutils/findutils_4.9.0.bb b/meta/recipes-extended/findutils/findutils_4.9.0.bb index 63560a4299..e4ce8ee4eb 100644 --- a/meta/recipes-extended/findutils/findutils_4.9.0.bb +++ b/meta/recipes-extended/findutils/findutils_4.9.0.bb @@ -1,6 +1,6 @@ require findutils.inc -# GPLv2+ (<< 4.2.32), GPLv3+ (>= 4.2.32) +# GPL-2.0-or-later (<< 4.2.32), GPL-3.0-or-later (>= 4.2.32) LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" diff --git a/meta/recipes-extended/gawk/gawk_5.1.1.bb b/meta/recipes-extended/gawk/gawk_5.1.1.bb index 40f994ff94..fe339805d0 100644 --- a/meta/recipes-extended/gawk/gawk_5.1.1.bb +++ b/meta/recipes-extended/gawk/gawk_5.1.1.bb @@ -6,8 +6,8 @@ HOMEPAGE = "https://www.gnu.org/software/gawk/" BUGTRACKER = "bug-gawk@gnu.org" SECTION = "console/utils" -# gawk <= 3.1.5: GPLv2 -# gawk >= 3.1.6: GPLv3 +# gawk <= 3.1.5: GPL-2.0-only +# gawk >= 3.1.6: GPL-3.0-only LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc index 15fd665ac8..b32584033b 100644 --- a/meta/recipes-extended/gzip/gzip.inc +++ b/meta/recipes-extended/gzip/gzip.inc @@ -3,7 +3,6 @@ DESCRIPTION = "GNU Gzip is a popular data compression program originally written project. Mark Adler wrote the decompression part" HOMEPAGE = "http://www.gnu.org/software/gzip/" SECTION = "console/utils" -# change to GPLv3+ in 2007/07. Previous GPLv2 version is 1.3.12 inherit autotools texinfo export DEFS="NO_ASM" diff --git a/meta/recipes-extended/gzip/gzip_1.11.bb b/meta/recipes-extended/gzip/gzip_1.11.bb index cff4ed1717..321c9c31a4 100644 --- a/meta/recipes-extended/gzip/gzip_1.11.bb +++ b/meta/recipes-extended/gzip/gzip_1.11.bb @@ -1,5 +1,7 @@ require gzip.inc +# change to GPL-3.0-or-later in 2007/07. Previous GPL-2.0-or-later version is +# 1.3.12 LICENSE = "GPL-3.0-or-later" SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ diff --git a/meta/recipes-extended/less/less_600.bb b/meta/recipes-extended/less/less_600.bb index 8b715fac6b..9ebe39daab 100644 --- a/meta/recipes-extended/less/less_600.bb +++ b/meta/recipes-extended/less/less_600.bb @@ -5,7 +5,7 @@ programs. Less offers many features beyond those that more does." HOMEPAGE = "http://www.greenwoodsoftware.com/" SECTION = "console/utils" -# (GPLv2+ (<< 418), GPLv3+ (>= 418)) | less +# (GPL-2.0-or-later (<< 418), GPL-3.0-or-later (>= 418)) | less # Including email author giving permissing to use BSD # # From: Mark Nudelman <markn@greenwoodsoftware.com> diff --git a/meta/recipes-extended/mdadm/mdadm_4.2.bb b/meta/recipes-extended/mdadm/mdadm_4.2.bb index 6f6e0c98ad..1c2fc8c37a 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.2.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Tool for managing software RAID under Linux" HOMEPAGE = "http://www.kernel.org/pub/linux/utils/raid/mdadm/" DESCRIPTION = "mdadm is a Linux utility used to manage and monitor software RAID devices." -# Some files are GPLv2+ while others are GPLv2. +# Some files are GPL-2.0-only while others are GPL-2.0-or-later. LICENSE = "GPL-2.0-only & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \ diff --git a/meta/recipes-extended/pam/libpam_1.5.2.bb b/meta/recipes-extended/pam/libpam_1.5.2.bb index 7277727745..081986ef43 100644 --- a/meta/recipes-extended/pam/libpam_1.5.2.bb +++ b/meta/recipes-extended/pam/libpam_1.5.2.bb @@ -6,7 +6,7 @@ BUGTRACKER = "https://fedorahosted.org/linux-pam/newticket" SECTION = "base" # PAM is dual licensed under GPL and BSD. # /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time -# libpam-runtime-1.0.1 is GPLv2+), by openembedded +# libpam-runtime-1.0.1 is GPL-2.0-or-later), by openembedded LICENSE = "GPL-2.0-or-later | BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3 \ file://libpamc/License;md5=a4da476a14c093fdc73be3c3c9ba8fb3 \ diff --git a/meta/recipes-extended/xz/xz_5.2.5.bb b/meta/recipes-extended/xz/xz_5.2.5.bb index c41987d87c..78aa6b20ca 100644 --- a/meta/recipes-extended/xz/xz_5.2.5.bb +++ b/meta/recipes-extended/xz/xz_5.2.5.bb @@ -3,10 +3,11 @@ HOMEPAGE = "https://tukaani.org/xz/" DESCRIPTION = "XZ Utils is free general-purpose data compression software with a high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils." SECTION = "base" -# The source includes bits of PD, GPLv2, GPLv3, LGPLv2.1+, but the only file -# which is GPLv3 is an m4 macro which isn't shipped in any of our packages, -# and the LGPL bits are under lib/, which appears to be used for libgnu, which -# appears to be used for DOS builds. So we're left with GPLv2+ and PD. +# The source includes bits of PD, GPL-2.0, GPL-3.0, LGPL-2.1-or-later, but the +# only file which is GPL-3.0 is an m4 macro which isn't shipped in any of our +# packages, and the LGPL bits are under lib/, which appears to be used for +# libgnu, which appears to be used for DOS builds. So we're left with +# GPL-2.0-or-later and PD. LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & PD" LICENSE:${PN} = "GPL-2.0-or-later" LICENSE:${PN}-dev = "GPL-2.0-or-later" |