diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2022-02-27 19:24:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-04 09:39:37 +0000 |
commit | 865e1505998d75669462d3b5d400885f07625e10 (patch) | |
tree | 008c30c48afb8b9d7a306fed1b2f4c685e3a3cc2 /documentation | |
parent | 99a5b42d5cef91b4238e641a2c53c0c44f1e9ca9 (diff) | |
download | poky-865e1505998d75669462d3b5d400885f07625e10.tar.gz |
manuals: Update LICENSE vars in examples to use SPDX license identifiers
This is similar to the recent change in meta to only use SPDX license
identifiers in the recipes.
(From yocto-docs rev: 147ce973d08f0bfb59b7b87fec8c8cc997d57112)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Reviewed-by: Quentin Schulz <foss+yocto@0leil.net>
Reviewed-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r-- | documentation/dev-manual/common-tasks.rst | 8 | ||||
-rw-r--r-- | documentation/ref-manual/variables.rst | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/documentation/dev-manual/common-tasks.rst b/documentation/dev-manual/common-tasks.rst index c111355ccd..cfa81176c3 100644 --- a/documentation/dev-manual/common-tasks.rst +++ b/documentation/dev-manual/common-tasks.rst | |||
@@ -564,7 +564,7 @@ Directory`. Here is the main ``xserver-xf86-config`` recipe, which is named | |||
564 | SUMMARY = "X.Org X server configuration file" | 564 | SUMMARY = "X.Org X server configuration file" |
565 | HOMEPAGE = "http://www.x.org" | 565 | HOMEPAGE = "http://www.x.org" |
566 | SECTION = "x11/base" | 566 | SECTION = "x11/base" |
567 | LICENSE = "MIT-X" | 567 | LICENSE = "MIT" |
568 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 568 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
569 | PR = "r33" | 569 | PR = "r33" |
570 | 570 | ||
@@ -1543,7 +1543,7 @@ variables: | |||
1543 | given a piece of software licensed under the GNU General Public | 1543 | given a piece of software licensed under the GNU General Public |
1544 | License version 2, you would set :term:`LICENSE` as follows:: | 1544 | License version 2, you would set :term:`LICENSE` as follows:: |
1545 | 1545 | ||
1546 | LICENSE = "GPLv2" | 1546 | LICENSE = "GPL-2.0-only" |
1547 | 1547 | ||
1548 | The licenses you specify within :term:`LICENSE` can have any name as long | 1548 | The licenses you specify within :term:`LICENSE` can have any name as long |
1549 | as you do not use spaces, since spaces are used as separators between | 1549 | as you do not use spaces, since spaces are used as separators between |
@@ -2338,7 +2338,7 @@ Following is one example: (``hello_2.3.bb``) | |||
2338 | 2338 | ||
2339 | SUMMARY = "GNU Helloworld application" | 2339 | SUMMARY = "GNU Helloworld application" |
2340 | SECTION = "examples" | 2340 | SECTION = "examples" |
2341 | LICENSE = "GPLv2+" | 2341 | LICENSE = "GPL-2.0-or-later" |
2342 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 2342 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
2343 | 2343 | ||
2344 | SRC_URI = "${GNU_MIRROR}/hello/hello-${PV}.tar.gz" | 2344 | SRC_URI = "${GNU_MIRROR}/hello/hello-${PV}.tar.gz" |
@@ -2378,7 +2378,7 @@ In the following example, ``mtd-utils`` is a makefile-based package:: | |||
2378 | SECTION = "base" | 2378 | SECTION = "base" |
2379 | DEPENDS = "zlib lzo e2fsprogs util-linux" | 2379 | DEPENDS = "zlib lzo e2fsprogs util-linux" |
2380 | HOMEPAGE = "http://www.linux-mtd.infradead.org/" | 2380 | HOMEPAGE = "http://www.linux-mtd.infradead.org/" |
2381 | LICENSE = "GPLv2+" | 2381 | LICENSE = "GPL-2.0-or-later" |
2382 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ | 2382 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ |
2383 | file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" | 2383 | file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" |
2384 | 2384 | ||
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst index ecb2b60c73..1621e5419e 100644 --- a/documentation/ref-manual/variables.rst +++ b/documentation/ref-manual/variables.rst | |||
@@ -4348,9 +4348,9 @@ system and gives an overview of their function and contents. | |||
4348 | 4348 | ||
4349 | Here are some examples:: | 4349 | Here are some examples:: |
4350 | 4350 | ||
4351 | LICENSE = "LGPLv2.1 | GPLv3" | 4351 | LICENSE = "LGPL-2.1-only | GPL-3.0-only" |
4352 | LICENSE = "MPL-1 & LGPLv2.1" | 4352 | LICENSE = "MPL-1.0 & LGPL-2.1-only" |
4353 | LICENSE = "GPLv2+" | 4353 | LICENSE = "GPL-2.0-or-later" |
4354 | 4354 | ||
4355 | The first example is from the | 4355 | The first example is from the |
4356 | recipes for Qt, which the user may choose to distribute under either | 4356 | recipes for Qt, which the user may choose to distribute under either |
@@ -4365,8 +4365,8 @@ system and gives an overview of their function and contents. | |||
4365 | but has accompanying documentation licensed under the GNU Free | 4365 | but has accompanying documentation licensed under the GNU Free |
4366 | Documentation License 1.2 could be specified as follows:: | 4366 | Documentation License 1.2 could be specified as follows:: |
4367 | 4367 | ||
4368 | LICENSE = "GFDL-1.2 & GPLv2" | 4368 | LICENSE = "GFDL-1.2 & GPL-2.0-only" |
4369 | LICENSE:${PN} = "GPLv2" | 4369 | LICENSE:${PN} = "GPL-2.0.only" |
4370 | LICENSE:${PN}-doc = "GFDL-1.2" | 4370 | LICENSE:${PN}-doc = "GFDL-1.2" |
4371 | 4371 | ||
4372 | :term:`LICENSE_CREATE_PACKAGE` | 4372 | :term:`LICENSE_CREATE_PACKAGE` |