summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2011-03-16 22:50:06 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-18 23:33:08 +0000
commit62432306752c9863780a7addf60b06f8035eddd4 (patch)
tree6a2b8e975a427b2c7810c69e2a76637ddedaf5a1
parentc0298557bad2e431f6dc87b6fda061cab561e14c (diff)
downloadpoky-62432306752c9863780a7addf60b06f8035eddd4.tar.gz
- documentation/poky-ref-manual: Notes added for non-GPLv3 builds
[BUGID# 873] - Added a note in the Images Appendix indicating that building an image without GPLv3 components is only supported for base and minimal images. Also put the two changes you have to do to the local.conf file for the build. Added a note in the second chapter in the section on building images. The note indicates the same as in the appendix but does not go into the local.conf file detail. (From OE-Core rev: c7960a2e820d7ddb8649ab0b27b3f04843f7af0d) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/poky-ref-manual/ref-images.xml12
-rw-r--r--documentation/poky-ref-manual/usingpoky.xml7
2 files changed, 18 insertions, 1 deletions
diff --git a/documentation/poky-ref-manual/ref-images.xml b/documentation/poky-ref-manual/ref-images.xml
index 9477883373..03cc624504 100644
--- a/documentation/poky-ref-manual/ref-images.xml
+++ b/documentation/poky-ref-manual/ref-images.xml
@@ -13,6 +13,18 @@
13 Images are listed below along with details of what they contain: 13 Images are listed below along with details of what they contain:
14 </para> 14 </para>
15 15
16 <note>
17 Building an image without GNU Public License Version 3 (GPLv3) components is
18 only supported for minimal and base images.
19 Furthermore, if you are going to build an image using non-GPLv3 components,
20 you must make the following changes in the <filename>local.conf</filename> file
21 before using the BitBake command to build the minimal or base image:
22 <literallayout class='monospaced'>
23 1. Comment out the IMAGE_EXTRA_FEATURES line
24 2. Set INCOMPATIBLE_LICENSE = "GPLv3"
25 </literallayout>
26 </note>
27
16 <itemizedlist> 28 <itemizedlist>
17 <listitem> 29 <listitem>
18 <para> 30 <para>
diff --git a/documentation/poky-ref-manual/usingpoky.xml b/documentation/poky-ref-manual/usingpoky.xml
index 75932665a3..92e3ed5a46 100644
--- a/documentation/poky-ref-manual/usingpoky.xml
+++ b/documentation/poky-ref-manual/usingpoky.xml
@@ -151,13 +151,18 @@
151 </para> 151 </para>
152 <para> 152 <para>
153 The target is the name of the recipe you want to build. 153 The target is the name of the recipe you want to build.
154 Common targets are the images in <filename>meta/recipes-core/images</filename>), 154 Common targets are the images in <filename>meta/recipes-core/images</filename>,
155 <filename>/meta/recipes-sato/images</filename>, etc. 155 <filename>/meta/recipes-sato/images</filename>, etc.
156 Or, the target can be the name of a recipe for a specific piece of software such as 156 Or, the target can be the name of a recipe for a specific piece of software such as
157 <application>busybox</application>. 157 <application>busybox</application>.
158 For more details about the standard images available, see the 158 For more details about the standard images available, see the
159 <link linkend="ref-images">'Reference: Images'</link> appendix. 159 <link linkend="ref-images">'Reference: Images'</link> appendix.
160 </para> 160 </para>
161 <note>
162 Building an image without GNU Public License Version 3 (GPLv3) components is
163 only supported for minimal and base images.
164 See <link linkend='ref-images'>'Reference: Images'</link> for more information.
165 </note>
161</section> 166</section>
162 167
163<section id='usingpoky-install'> 168<section id='usingpoky-install'>