diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2014-07-22 13:36:13 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-23 10:02:13 +0100 |
commit | b72dc514a57fcce254252f1ea0ebb4c98ff5ffaa (patch) | |
tree | 9f556e9dfcc1d67bf0dc14d7e41fc448b6b0cfc6 | |
parent | 2dec5d573d5d9476daab6b98bb4694126e483e77 (diff) | |
download | poky-b72dc514a57fcce254252f1ea0ebb4c98ff5ffaa.tar.gz |
ref-manual: Provided canonical GP license names.
Fixes [YOCTO #6499]
Fixed a couple example INCOMPATIBLE_LICENSE examples so that
they now use the canonical licensing names GPL-3.0 LGPL-3.0 AGPL-3.0.
(From yocto-docs rev: d2d6be323d1a5ed9da88b7924954f9733a78da84)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | documentation/ref-manual/ref-images.xml | 2 | ||||
-rw-r--r-- | documentation/ref-manual/ref-variables.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/documentation/ref-manual/ref-images.xml b/documentation/ref-manual/ref-images.xml index 7f65fe9687..cc70f89433 100644 --- a/documentation/ref-manual/ref-images.xml +++ b/documentation/ref-manual/ref-images.xml | |||
@@ -23,7 +23,7 @@ | |||
23 | command to build the minimal or base image: | 23 | command to build the minimal or base image: |
24 | <literallayout class='monospaced'> | 24 | <literallayout class='monospaced'> |
25 | 1. Comment out the EXTRA_IMAGE_FEATURES line | 25 | 1. Comment out the EXTRA_IMAGE_FEATURES line |
26 | 2. Set INCOMPATIBLE_LICENSE = "GPLv3 LGPLv3 AGPL-3.0" | 26 | 2. Set INCOMPATIBLE_LICENSE = "GPL-3.0 LGPL-3.0 AGPL-3.0" |
27 | </literallayout> | 27 | </literallayout> |
28 | </note> | 28 | </note> |
29 | 29 | ||
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index 5add80f815..b4d6e71654 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml | |||
@@ -3851,7 +3851,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
3851 | This functionality is only regularly tested using | 3851 | This functionality is only regularly tested using |
3852 | the following setting: | 3852 | the following setting: |
3853 | <literallayout class='monospaced'> | 3853 | <literallayout class='monospaced'> |
3854 | INCOMPATIBLE_LICENSE = "GPLv3 LGPLv3 AGPL-3.0" | 3854 | INCOMPATIBLE_LICENSE = "GPL-3.0 LGPL-3.0 AGPL-3.0" |
3855 | </literallayout> | 3855 | </literallayout> |
3856 | Although you can use other settings, you might be required | 3856 | Although you can use other settings, you might be required |
3857 | to remove dependencies on or provide alternatives to | 3857 | to remove dependencies on or provide alternatives to |