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.  Additionally, a few license declarations of just
"BSD" have been updated with the more specifc "BSD-3-Clause" after
inspecting the licenses in the source, as the non-specific name
now triggers a warning.

Bug-AGL: SPEC-3819

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

diff --git a/recipes-connectivity/cannelloni/cannelloni_git.bb b/recipes-connectivity/cannelloni/cannelloni_git.bb
index 5378540..e4a4fa7 100644 (file)
--- a/recipes-connectivity/cannelloni/cannelloni_git.bb
+++ b/recipes-connectivity/cannelloni/cannelloni_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "A SocketCAN over Ethernet tunnel"
 HOMEPAGE = "https://github.com/mguentner/cannelloni"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https;branch=master \

diff --git a/recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb b/recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb
index c24e37c..77ca871 100644 (file)
--- a/recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb
+++ b/recipes-connectivity/rtl-sdr/rtl-sdr_0.5.3.bb
@@ -2,7 +2,7 @@ SUMMARY = "Turns a Realtek RTL2832U-based DVB dongle into a SDR receiver"
 DESCRIPTION = "DVB-T dongles based on the Realtek RTL2832U chipset can be used as Software Digital Radio adapters, since the chip allows transferring raw I/Q samples to the host, which is really used for DAB/DAB+/FM demodulation."
 HOMEPAGE = "http://sdr.osmocom.org/trac/wiki/rtl-sdr"
 
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://src/librtlsdr.c;endline=18;md5=1b05599c3ebd4d74857a0a7c45f3d4ef"
 

diff --git a/recipes-demo/radio/radio_git.bb b/recipes-demo/radio/radio_git.bb
index e4dd07c..326c411 100644 (file)
--- a/recipes-demo/radio/radio_git.bb
+++ b/recipes-demo/radio/radio_git.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "AGL demonstration Radio application"
 HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/radio"
 SECTION     = "apps"
 
-LICENSE     = "Apache-2.0 & GPLv2+"
+LICENSE     = "Apache-2.0 & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
 DEPENDS = "qtquickcontrols2 libqtappfw"

diff --git a/recipes-kernel/sllin/sllin.bb b/recipes-kernel/sllin/sllin.bb
index a64b0f9..2accf40 100644 (file)
--- a/recipes-kernel/sllin/sllin.bb
+++ b/recipes-kernel/sllin/sllin.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "slLIN driver module"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://sllin.c;beginline=7;endline=37;md5=6408e14dba951f8cbe3c2a003a0d89d2"
 
 inherit module systemd

diff --git a/recipes-multimedia/flite/flite_1.06.bb b/recipes-multimedia/flite/flite_1.06.bb
index b1f8375..f3b77c3 100755 (executable)
--- a/recipes-multimedia/flite/flite_1.06.bb
+++ b/recipes-multimedia/flite/flite_1.06.bb
@@ -1,7 +1,7 @@
 SUMMARY = "The Flite+hts_engine is an English TTS System."
 HOMEPAGE = "http://hts-engine.sourceforge.net/"
 SECTION = "libs"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=a1ab16abd1c593cab35c2987fd871678"
 

diff --git a/recipes-multimedia/hts_engine/hts-engine_1.10.bb b/recipes-multimedia/hts_engine/hts-engine_1.10.bb
index ed5cae6..5a72c5a 100644 (file)
--- a/recipes-multimedia/hts_engine/hts-engine_1.10.bb
+++ b/recipes-multimedia/hts_engine/hts-engine_1.10.bb
@@ -1,7 +1,7 @@
 SUMMARY = "hts_engine is software to synthesize speech waveform from HMMs trained by the HMM-based speech synthesis system (HTS)."
 HOMEPAGE = "http://hts-engine.sourceforge.net/"
 SECTION = "libs"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=b3be85b37c90bfd4d34d79a0e3f28700"
 

diff --git a/recipes-multimedia/libmp4v2/libmp4v2_git.bb b/recipes-multimedia/libmp4v2/libmp4v2_git.bb
index ed6c8b4..5fb6cbc 100644 (file)
--- a/recipes-multimedia/libmp4v2/libmp4v2_git.bb
+++ b/recipes-multimedia/libmp4v2/libmp4v2_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "The MP4v2 library provides an API to create and modify mp4 files"
 HOMEPAGE = "https://github.com/sergiomb2/libmp4v2/wiki"
-LICENSE = "MPLv1.1"
+LICENSE = "MPL-1.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb3014b036b6d2151d944aef6a84c36f"
 
 inherit autotools-brokensep pkgconfig

diff --git a/recipes-multimedia/musicpd/mpc_0.33.bb b/recipes-multimedia/musicpd/mpc_0.33.bb
index 09190a8..b3178ea 100644 (file)
--- a/recipes-multimedia/musicpd/mpc_0.33.bb
+++ b/recipes-multimedia/musicpd/mpc_0.33.bb
@@ -1,5 +1,5 @@
 SUMMARY = "A minimalist command line interface to the Music Player Daemon"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 HOMEPAGE = "https://www.musicpd.org/clients/mpc/"
 

diff --git a/recipes-multimedia/musicpd/mpd_0.23.5.bb b/recipes-multimedia/musicpd/mpd_0.23.5.bb
index 5596760..f6baca5 100644 (file)
--- a/recipes-multimedia/musicpd/mpd_0.23.5.bb
+++ b/recipes-multimedia/musicpd/mpd_0.23.5.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Music Player Daemon"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 HOMEPAGE ="http://www.musicpd.org"

diff --git a/recipes-multimedia/openjtalk/openjtalk_1.09.bb b/recipes-multimedia/openjtalk/openjtalk_1.09.bb
index 0c780a0..a5f7313 100644 (file)
--- a/recipes-multimedia/openjtalk/openjtalk_1.09.bb
+++ b/recipes-multimedia/openjtalk/openjtalk_1.09.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Open JTalk is a Japanese text-to-speech system."
 HOMEPAGE = "http://open-jtalk.sourceforge.net/"
 SECTION = "libs"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=ec9073c0ca40ff7c388b31cfd6a07a9e"
 

diff --git a/recipes-support/lin-config/lin-config_git.bb b/recipes-support/lin-config/lin-config_git.bb
index 0bb604d..ba6f2c4 100644 (file)
--- a/recipes-support/lin-config/lin-config_git.bb
+++ b/recipes-support/lin-config/lin-config_git.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "lin-config tool for the sllin driver module"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://lin_config.c;beginline=4;endline=9;md5=196a29df19a30dbc752937bdfc819d7a"
 
 DEPENDS += "libnl libxml2"

diff --git a/recipes-wam/chromium/chromium.inc b/recipes-wam/chromium/chromium.inc
index 8c82542..b641a64 100644 (file)
--- a/recipes-wam/chromium/chromium.inc
+++ b/recipes-wam/chromium/chromium.inc
@@ -3,7 +3,7 @@
 SUMMARY = "Chromium webruntime for webOS"
 AUTHOR = "Lokesh Kumar Goel <lokeshkumar.goel@lge.com>"
 SECTION = "webos/apps"
-LICENSE = "Apache-2.0 & BSD-3-Clause & LGPL-2.0 & LGPL-2.1"
+LICENSE = "Apache-2.0 & BSD-3-Clause & LGPL-2.0-only & LGPL-2.1-only"
 LIC_FILES_CHKSUM = "\
     file://src/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
     file://src/third_party/blink/renderer/core/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \