[bootlin/training-materials updates] master: yocto: slides: update to using SPDX for LICENSE (49194a00)
Luca Ceresoli
luca.ceresoli at bootlin.com
Fri Jul 15 16:16:05 CEST 2022
Repository : https://github.com/bootlin/training-materials
On branch : master
Link : https://github.com/bootlin/training-materials/commit/49194a00751b5e6903e880371c0e78a60e29303e
>---------------------------------------------------------------
commit 49194a00751b5e6903e880371c0e78a60e29303e
Author: Luca Ceresoli <luca.ceresoli at bootlin.com>
Date: Fri Jul 15 16:14:26 2022 +0200
yocto: slides: update to using SPDX for LICENSE
Yocto is migrating to SPDX identifiers and kirkstone warns out when using
old identifiers. Document that and update our examples.
Signed-off-by: Luca Ceresoli <luca.ceresoli at bootlin.com>
>---------------------------------------------------------------
49194a00751b5e6903e880371c0e78a60e29303e
slides/yocto-licensing/yocto-licensing.tex | 4 ++--
slides/yocto-recipe-advanced/yocto-recipe-advanced.tex | 2 +-
slides/yocto-recipe-basics/yocto-recipe-basics.tex | 9 +++++----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/slides/yocto-licensing/yocto-licensing.tex b/slides/yocto-licensing/yocto-licensing.tex
index b6ae67b2..d02f4e08 100644
--- a/slides/yocto-licensing/yocto-licensing.tex
+++ b/slides/yocto-licensing/yocto-licensing.tex
@@ -33,7 +33,7 @@ LIC_FILES_CHKSUM = " \
\item To exclude all GPLv3 packages:
\begin{block}{}
\begin{minted}{c}
-INCOMPATIBLE_LICENSE = "GPLv3"
+INCOMPATIBLE_LICENSE = "GPL-3.0* LGPL-3.0* AGPL-3.0*"
\end{minted}
\end{block}
\item License names are the ones used in the \code{LICENSE}
@@ -76,7 +76,7 @@ LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly"
PACKAGE NAME: busybox
PACKAGE VERSION: 1.31.1
RECIPE NAME: busybox
-LICENSE: GPLv2 & bzip2-1.0.6
+LICENSE: GPL-2.0-only & bzip2-1.0.4
PACKAGE NAME: dropbear
PACKAGE VERSION: 2019.78
diff --git a/slides/yocto-recipe-advanced/yocto-recipe-advanced.tex b/slides/yocto-recipe-advanced/yocto-recipe-advanced.tex
index c49f5d6d..0e4cefab 100644
--- a/slides/yocto-recipe-advanced/yocto-recipe-advanced.tex
+++ b/slides/yocto-recipe-advanced/yocto-recipe-advanced.tex
@@ -202,7 +202,7 @@ DESCRIPTION = "Print a friendly, customizable greeting"
HOMEPAGE = "https://www.gnu.org/software/hello/"
PRIORITY = "optional"
SECTION = "examples"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0-or-later"
SRC_URI = "${GNU_MIRROR}/hello/hello-${PV}.tar.gz"
SRC_URI[md5sum] = "67607d2616a0faaf5bc94c59dca7c3cb"
diff --git a/slides/yocto-recipe-basics/yocto-recipe-basics.tex b/slides/yocto-recipe-basics/yocto-recipe-basics.tex
index 116cc3d7..bd8a4de2 100644
--- a/slides/yocto-recipe-basics/yocto-recipe-basics.tex
+++ b/slides/yocto-recipe-basics/yocto-recipe-basics.tex
@@ -96,7 +96,8 @@
\item[HOMEPAGE] URL to the project's homepage
\item[PRIORITY] defaults to \code{optional}
\item[SECTION] package category (e.g. \code{console/utils})
- \item[LICENSE] the application's license
+ \item[LICENSE] the application's license, using SPDX identifiers
+ (\url{https://spdx.org/licenses/})
\end{description}
\end{itemize}
\end{frame}
@@ -441,7 +442,7 @@ DESCRIPTION = "Hello world program"
HOMEPAGE = "http://example.net/hello/"
PRIORITY = "optional"
SECTION = "examples"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-or-later"
SRC_URI = "git://git.example.com/hello;protocol=https"
SRCREV = "2d47b4eb66e705458a17622c2e09367300a7b118"
@@ -493,7 +494,7 @@ do_install() { ... }
\begin{minted}[fontsize=\small]{sh}
require tar.inc
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = \
"file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
@@ -510,7 +511,7 @@ SRC_URI[md5sum] = "c6c4f1c075dbf0f75c29737faa58f290"
\begin{minted}[fontsize=\small]{sh}
require tar.inc
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = \
"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
More information about the training-materials-updates
mailing list