Update to SPDX license names

Apply updates from running the new convert-spdx-licenses script
from upstream.  This is not currently a hard requirement from
upstream, but futureproofs for when the license name mapping is
finally removed.

Bug-AGL: SPEC-3819

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Iad7f9d353d3111287e2b39ee98cd872e2b7fec32

diff --git a/meta-agl-jailhouse/recipes-extended/jailhouse/jailhouse_git.bb b/meta-agl-jailhouse/recipes-extended/jailhouse/jailhouse_git.bb
index 2c9bff5..f299d0e 100644 (file)
--- a/meta-agl-jailhouse/recipes-extended/jailhouse/jailhouse_git.bb
+++ b/meta-agl-jailhouse/recipes-extended/jailhouse/jailhouse_git.bb
@@ -4,7 +4,7 @@ operating systems besides Linux. For this purpose, it configures CPU and device
 platform in a way that none of these domains, called 'cells' here, can interfere with each other in an unacceptable way."
 HOMEPAGE = "https://github.com/siemens/jailhouse"
 SECTION = "jailhouse"
-LICENSE = "GPL-2.0 & BSD-2-Clause"
+LICENSE = "GPL-2.0-only & BSD-2-Clause"
 
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \

diff --git a/meta-agl-jailhouse/recipes-extended/jailhouse/virtio-ivshmem-block.bb b/meta-agl-jailhouse/recipes-extended/jailhouse/virtio-ivshmem-block.bb
index 4ee6c98..cb000e3 100644 (file)
--- a/meta-agl-jailhouse/recipes-extended/jailhouse/virtio-ivshmem-block.bb
+++ b/meta-agl-jailhouse/recipes-extended/jailhouse/virtio-ivshmem-block.bb
@@ -2,7 +2,7 @@ SUMMARY = "virtio-ivshmem-block built out of the kernel tree"
 DESCRIPTION = "virtio-ivshmem-block built out of the kernel tree."
 HOMEPAGE = "https://kernel.org"
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 PR = "r1"
 

diff --git a/meta-agl-jailhouse/recipes-extended/jailhouse/virtio-ivshmem-console.bb b/meta-agl-jailhouse/recipes-extended/jailhouse/virtio-ivshmem-console.bb
index 3d046f1..8c64a24 100644 (file)
--- a/meta-agl-jailhouse/recipes-extended/jailhouse/virtio-ivshmem-console.bb
+++ b/meta-agl-jailhouse/recipes-extended/jailhouse/virtio-ivshmem-console.bb
@@ -2,7 +2,7 @@ SUMMARY = "virtio-ivshmem-console built out of the kernel tree"
 DESCRIPTION = "virtio-ivshmem-console built out of the kernel tree."
 HOMEPAGE = "https://kernel.org"
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 PR = "r1"
 

diff --git a/meta-agl-jailhouse/recipes-kernel/linux-jailhouse-custom/kernel-devsrc.bb b/meta-agl-jailhouse/recipes-kernel/linux-jailhouse-custom/kernel-devsrc.bb
index 8a6e490..6bf9fe7 100644 (file)
--- a/meta-agl-jailhouse/recipes-kernel/linux-jailhouse-custom/kernel-devsrc.bb
+++ b/meta-agl-jailhouse/recipes-kernel/linux-jailhouse-custom/kernel-devsrc.bb
@@ -5,7 +5,7 @@ development or external module builds"
 
 SECTION = "kernel"
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 inherit linux-kernel-base
 

diff --git a/meta-agl-jailhouse/recipes-kernel/linux-jailhouse-custom/linux-jailhouse-custom_git.bb b/meta-agl-jailhouse/recipes-kernel/linux-jailhouse-custom/linux-jailhouse-custom_git.bb
index 8401a45..23b1ceb 100644 (file)
--- a/meta-agl-jailhouse/recipes-kernel/linux-jailhouse-custom/linux-jailhouse-custom_git.bb
+++ b/meta-agl-jailhouse/recipes-kernel/linux-jailhouse-custom/linux-jailhouse-custom_git.bb
@@ -1,5 +1,5 @@
 # Recipe created by recipetool
-LICENSE = "GPL-2.0"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 inherit kernel

diff --git a/meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb b/meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb
index 48ab6a8..3c93427 100644 (file)
--- a/meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb
+++ b/meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb
@@ -1,7 +1,7 @@
 SUMMARY     = "Momiyama navigation example based on mapbox."
 DESCRIPTION = "The mominavi is a navigation example based on mapbox. It's based on aglqtnavigation. \
                The mominavi is not require agl-appfw."
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS = " \

diff --git a/meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb b/meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb
index 55253ff..6fdc309 100644 (file)
--- a/meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb
+++ b/meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb
@@ -1,7 +1,7 @@
 SUMMARY     = "Momiyama home screen example"
 DESCRIPTION = "The momiscreen is a home screen example. \
                The momiscreen is not require agl-appfw."
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS = " \

diff --git a/meta-egvirt/recipes-kernel/kernel-module-virtio-video/kernel-module-virtio-video.bb b/meta-egvirt/recipes-kernel/kernel-module-virtio-video/kernel-module-virtio-video.bb
index baaa969..6d023d2 100644 (file)
--- a/meta-egvirt/recipes-kernel/kernel-module-virtio-video/kernel-module-virtio-video.bb
+++ b/meta-egvirt/recipes-kernel/kernel-module-virtio-video/kernel-module-virtio-video.bb
@@ -1,6 +1,6 @@
 SUMMARY = "VIRTIO video device driver"
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://virtio_video.h;endline=17;md5=3a04f9e12610bad07c6ec369a8077ba6"
 
 inherit module

diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libscalar-list-utils-perl_1.55.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libscalar-list-utils-perl_1.55.bb
index 72780a6..ccbee34 100644 (file)
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libscalar-list-utils-perl_1.55.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libscalar-list-utils-perl_1.55.bb
@@ -5,7 +5,7 @@ high enough to warrant the use of a keyword, and the size so small such \
 that being individual extensions would be wasteful."
 HOMEPAGE = "https://metacpan.org/release/Scalar-List-Utils"
 SECTION = "libs"
-LICENSE = "Artisticv1 | GPLv1+"
+LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
                     file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d"

diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libxml-xpath-perl_1.44.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libxml-xpath-perl_1.44.bb
index 3049ced..fe5bc8f 100644 (file)
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libxml-xpath-perl_1.44.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libxml-xpath-perl_1.44.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Perl modules for parsing and evaluating XPath statements"
 HOMEPAGE = "https://metacpan.org/release/XML-XPath"
 SECTION = "libs"
-LICENSE = "Artistic-2.0 & (Artistic-1.0 | GPL-1.0+)"
+LICENSE = "Artistic-2.0 & (Artistic-1.0 | GPL-1.0-or-later)"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b5714f72ee964281c4a38b1f0db4213e \
                     file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
                     file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d"

diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/kernel-module-evklib_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/kernel-module-evklib_1.0.0.bb
index 9ab1590..c40b270 100644 (file)
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/kernel-module-evklib_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/kernel-module-evklib_1.0.0.bb
@@ -3,7 +3,7 @@
 #
 SUMMARY = "libev kernel module for AGL software"
 DESCRIPTION = "libev kernel module build AGL software"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL-2.0-only;md5=4ee23c52855c222cba72583d301d2338"
 
 PV = "1.0.0+gitr${SRCPV}"