From bbc532e7c65c507ea6b91d1e73ecb60b34d4ab54 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 6 Mar 2022 11:30:24 +0100 Subject: layer: Update LICENSE variable to use SPDX license identifiers Since OE-Core commit 9379f80f48 ("license/insane: Show warning for obsolete license usage"), LICENSE field not containing SPDX identifiers are treated with WARNING. An automated conversion using scripts/contrib/convert-spdx-licenses.py to convert to use the standard SPDX license identifiers has been done on the entire layer. Signed-off-by: Max Krummenacher --- meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb | 2 +- qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb | 2 +- recipes-devtools/mmc/mmc-utils-cos_git.bb | 2 +- recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb | 2 +- recipes-graphics/gpicview/gpicview_0.2.5.bb | 2 +- recipes-graphics/rdesktop/rdesktop_1.8.3.bb | 2 +- recipes-graphics/scrot/giblib_1.2.4.bb | 2 +- recipes-graphics/scrot/imlib2_git.bb | 2 +- recipes-graphics/scrot/scrot_0.8.bb | 2 +- recipes-graphics/vnc/directvnc_0.7.8.bb | 2 +- recipes-graphics/vnc/tightvnc_1.3.10.bb | 2 +- recipes-multimedia/codecgraph/codecgraph_20120114.bb | 2 +- recipes-multimedia/tinycompress/tinycompress_1.1.6.bb | 2 +- recipes-support/florence/florence3_0.6.3.bb | 2 +- recipes-support/florence/florence_0.5.4.bb | 2 +- recipes-support/joe/joe_4.6.bb | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb b/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb index 4a7af6b..034342f 100644 --- a/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb +++ b/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Falkon Webbrowser" HOMEPAGE = "http://www.falkon.org" SECTION = "x11" -LICENSE = "GPLv3 & LGPLv3 & MIT" +LICENSE = "GPL-3.0-only & LGPL-3.0-only & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" DEPENDS = "libxcb ki18n openssl qtbase qttools-native qtwebengine qtx11extras" diff --git a/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb b/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb index 7c1e563..11bb90d 100644 --- a/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb +++ b/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb @@ -2,7 +2,7 @@ SUMMARY = "QEdit Text Editor" HOMEPAGE = "http://hugo.pereira.free.fr/software/index.php?page=package&package_list=software_list_qt&package=qedit&full=0" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d" DEPENDS = "qtbase qtx11extras" diff --git a/recipes-devtools/mmc/mmc-utils-cos_git.bb b/recipes-devtools/mmc/mmc-utils-cos_git.bb index ff91aa3..c66e6b1 100644 --- a/recipes-devtools/mmc/mmc-utils-cos_git.bb +++ b/recipes-devtools/mmc/mmc-utils-cos_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Userspace tools for MMC/SD devices (Downstream version of Chromium OS Project)" HOMEPAGE = "http://chromium.googlesource.com/chromiumos/third_party/mmc-utils.git" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946ef819969503f0" inherit update-alternatives diff --git a/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb b/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb index 8a39998..8a89f83 100644 --- a/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb +++ b/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb @@ -1,6 +1,6 @@ SUMMARY = "GNOME disk utility" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "avahi-ui glib-2.0 gnome-doc-utils gtk+3 intltool-native \ diff --git a/recipes-graphics/gpicview/gpicview_0.2.5.bb b/recipes-graphics/gpicview/gpicview_0.2.5.bb index 53d996f..6e1020b 100644 --- a/recipes-graphics/gpicview/gpicview_0.2.5.bb +++ b/recipes-graphics/gpicview/gpicview_0.2.5.bb @@ -2,7 +2,7 @@ SUMMARY = "Simple Image Viewer for X" HOMEPAGE = "http://lxde.sourceforge.net/gpicview" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "glib-2.0-native intltool-native jpeg" diff --git a/recipes-graphics/rdesktop/rdesktop_1.8.3.bb b/recipes-graphics/rdesktop/rdesktop_1.8.3.bb index f1d09c3..78faa6c 100644 --- a/recipes-graphics/rdesktop/rdesktop_1.8.3.bb +++ b/recipes-graphics/rdesktop/rdesktop_1.8.3.bb @@ -1,7 +1,7 @@ DESCRIPTION-${PN}-client = "A remote desktop protocol client" HOMEPAGE = "http://www.rdesktop.org/" SECTION = "utils" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" require rdesktop.inc diff --git a/recipes-graphics/scrot/giblib_1.2.4.bb b/recipes-graphics/scrot/giblib_1.2.4.bb index 8cc6835..701e4ed 100644 --- a/recipes-graphics/scrot/giblib_1.2.4.bb +++ b/recipes-graphics/scrot/giblib_1.2.4.bb @@ -1,7 +1,7 @@ SECTION = "graphic/utils" SUMMARY = "giblib is a simple library which wraps imlib2" HOMEPAGE = "http://linuxbrit.co.uk/software/" -LICENSE = "BSD" +LICENSE = "MIT-feh" DEPENDS = "imlib2" diff --git a/recipes-graphics/scrot/imlib2_git.bb b/recipes-graphics/scrot/imlib2_git.bb index 3213b15..8abd7d7 100644 --- a/recipes-graphics/scrot/imlib2_git.bb +++ b/recipes-graphics/scrot/imlib2_git.bb @@ -1,5 +1,5 @@ SUMMARY = "A graphic library for file loading, saving, rendering, and manipulation" -LICENSE = "MIT & BSD" +LICENSE = "Imlib2" LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" diff --git a/recipes-graphics/scrot/scrot_0.8.bb b/recipes-graphics/scrot/scrot_0.8.bb index 91b5638..0d45f7a 100644 --- a/recipes-graphics/scrot/scrot_0.8.bb +++ b/recipes-graphics/scrot/scrot_0.8.bb @@ -2,7 +2,7 @@ SECTION = "graphic/utils" SUMMARY = "scrot (SCReen shOT), screen capture utility" DESCRIPTION = "scrot (SCReen shOT) is a simple commandline screen capture utility that uses imlib2 to grab and save images" HOMEPAGE = "http://linuxbrit.co.uk/software/" -LICENSE = "BSD" +LICENSE = "MIT-feh" RDEPENDS:${PN} = "imlib2-loaders" DEPENDS = "imlib2 giblib" diff --git a/recipes-graphics/vnc/directvnc_0.7.8.bb b/recipes-graphics/vnc/directvnc_0.7.8.bb index 42c56c5..6f82628 100644 --- a/recipes-graphics/vnc/directvnc_0.7.8.bb +++ b/recipes-graphics/vnc/directvnc_0.7.8.bb @@ -1,7 +1,7 @@ SUMMARY = "Provides a very thin VNC client for unix framebuffer systems" HOMEPAGE = "http://drinkmilk.github.com/directvnc/" SECTION = "utils" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" DEPENDS = "zlib libpng jpeg directfb xproto" diff --git a/recipes-graphics/vnc/tightvnc_1.3.10.bb b/recipes-graphics/vnc/tightvnc_1.3.10.bb index 4a707b7..29435d0 100644 --- a/recipes-graphics/vnc/tightvnc_1.3.10.bb +++ b/recipes-graphics/vnc/tightvnc_1.3.10.bb @@ -1,7 +1,7 @@ SUMMARY = "A lightweight VNC viewer" HOMEPAGE = "http://www.tightvnc.com/" SECTION = "utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://../LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" DEPENDS = "virtual/libx11 zlib libxmu libxaw jpeg libxt libxext libxmu" diff --git a/recipes-multimedia/codecgraph/codecgraph_20120114.bb b/recipes-multimedia/codecgraph/codecgraph_20120114.bb index f3b687b..8602506 100644 --- a/recipes-multimedia/codecgraph/codecgraph_20120114.bb +++ b/recipes-multimedia/codecgraph/codecgraph_20120114.bb @@ -2,7 +2,7 @@ SECTION = "multimedia" SUMMARY = "Tool to generate a graph of HDA codec config" DESCRIPTION = "Codecgraph is a tool to generate a graph based on the ALSA description of a High Definition Audio codec." HOMEPAGE = "http://helllabs.org/codecgraph/" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" RDEPENDS:${PN} = "python graphviz" SRC_URI = "http://helllabs.org/codecgraph/codecgraph-${PV}.tar.gz" diff --git a/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb b/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb index 2e63c70..610d521 100644 --- a/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb +++ b/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb @@ -1,6 +1,6 @@ SUMMARY = "tinycompress library for compress audio offload in alsa" DESCRIPTION = "A library to handle compressed formats like MP3 etc" -LICENSE = "BSD-3-Clause | LGPLv2.1" +LICENSE = "BSD-3-Clause | LGPL-2.1-only" inherit autotools pkgconfig LIC_FILES_CHKSUM = "file://COPYING;md5=cf9105c1a2d4405cbe04bbe3367373a0" diff --git a/recipes-support/florence/florence3_0.6.3.bb b/recipes-support/florence/florence3_0.6.3.bb index d82b57c..b37fd30 100644 --- a/recipes-support/florence/florence3_0.6.3.bb +++ b/recipes-support/florence/florence3_0.6.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://florence.sourceforge.net/english.html" #NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once. -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" PR = "r1" diff --git a/recipes-support/florence/florence_0.5.4.bb b/recipes-support/florence/florence_0.5.4.bb index 28f7f64..486bb9c 100644 --- a/recipes-support/florence/florence_0.5.4.bb +++ b/recipes-support/florence/florence_0.5.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://florence.sourceforge.net/english.html" #NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once. -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" PR = "r1" diff --git a/recipes-support/joe/joe_4.6.bb b/recipes-support/joe/joe_4.6.bb index 674736a..ed0bf33 100644 --- a/recipes-support/joe/joe_4.6.bb +++ b/recipes-support/joe/joe_4.6.bb @@ -1,7 +1,7 @@ SECTION = "console/utils" SUMMARY = "Console text editor with good functionality, good choice for vi-haters" HOMEPAGE = "http://joe-editor.sourceforge.net/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" -- cgit v1.2.3