diff options
| author |   Scott Rifenbark <scott.m.rifenbark@intel.com> | 2014-07-07 10:27:38 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-21 19:06:52 +0100 |
| commit | 1b7c45eaec92e0dfc3448721d6c88a3933460e3a (patch) | |
| tree | 98655796461d71e20ad0a9cbfbc8f430f1a066e2 | |
| parent | 476778761389f971e4ade929b76ff53bf8b72de6 (diff) | |
| download | openembedded-core-contrib-1b7c45eaec92e0dfc3448721d6c88a3933460e3a.tar.gz | |
ref-manual: Modified licensing verbiage for GPLv3
Fixes [YOCTO #6499]
Updated three areas to include similarly licenced components
regarding the use of non-GPLv3 licensing.
(From yocto-docs rev: 88c0720e4070be58fbde17bc04db2b53c3307bf8)
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 | 13 | ||||
| -rw-r--r-- | documentation/ref-manual/ref-variables.xml | 2 | ||||
| -rw-r--r-- | documentation/ref-manual/usingpoky.xml | 5 |
3 files changed, 12 insertions, 8 deletions
diff --git a/documentation/ref-manual/ref-images.xml b/documentation/ref-manual/ref-images.xml index 7727e0a869..7f65fe9687 100644 --- a/documentation/ref-manual/ref-images.xml +++ b/documentation/ref-manual/ref-images.xml @@ -13,14 +13,17 @@ </para> <note> - Building an image without GNU General Public License Version 3 (GPLv3) components + Building an image without GNU General Public License Version 3 (GPLv3), + GNU Lesser General Public License Version 3 (LGPLv3), and the + GNU Affero General Public License Version 3 (AGPL-3.0) components is only supported for minimal and base images. - Furthermore, if you are going to build an image using non-GPLv3 components, - you must make the following changes in the <filename>local.conf</filename> file - before using the BitBake command to build the minimal or base image: + Furthermore, if you are going to build an image using non-GPLv3 and + similarly licensed components, you must make the following changes in + the <filename>local.conf</filename> file before using the BitBake + command to build the minimal or base image: <literallayout class='monospaced'> 1. Comment out the EXTRA_IMAGE_FEATURES line - 2. Set INCOMPATIBLE_LICENSE = "GPLv3" + 2. Set INCOMPATIBLE_LICENSE = "GPLv3 LGPLv3 AGPL-3.0" </literallayout> </note> diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index f51691f565..678b102c50 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml @@ -3845,7 +3845,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" This functionality is only regularly tested using the following setting: <literallayout class='monospaced'> - INCOMPATIBLE_LICENSE = "GPLv3" + INCOMPATIBLE_LICENSE = "GPLv3 LGPLv3 AGPL-3.0" </literallayout> Although you can use other settings, you might be required to remove dependencies on or provide alternatives to diff --git a/documentation/ref-manual/usingpoky.xml b/documentation/ref-manual/usingpoky.xml index 3c82d8185b..164e82e358 100644 --- a/documentation/ref-manual/usingpoky.xml +++ b/documentation/ref-manual/usingpoky.xml @@ -69,8 +69,9 @@ </para> <note> - Building an image without GNU General Public License Version 3 (GPLv3) components - is supported for only minimal and base images. + Building an image without GNU General Public License Version + 3 (GPLv3), or similarly licensed, components is supported for + only minimal and base images. See the "<link linkend='ref-images'>Images</link>" chapter for more information. </note> </section> |