aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/ref-manual/ref-images.xml13
-rw-r--r--documentation/ref-manual/ref-variables.xml2
-rw-r--r--documentation/ref-manual/usingpoky.xml5
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>