[BUGID# 873] - 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.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>

diff --git a/documentation/poky-ref-manual/ref-images.xml b/documentation/poky-ref-manual/ref-images.xml
index 94778833731a6568942d9baa89f8447c8f1df222..03cc62450412e6ff9ba9008f8e7433359880098d 100644 (file)
--- a/documentation/poky-ref-manual/ref-images.xml
+++ b/documentation/poky-ref-manual/ref-images.xml
@@ -13,6 +13,18 @@
         Images are listed below along with details of what they contain:
     </para>
 
+    <note>
+        Building an image without GNU Public License Version 3 (GPLv3) 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:
+        <literallayout class='monospaced'>
+     1. Comment out the IMAGE_EXTRA_FEATURES line
+     2. Set INCOMPATIBLE_LICENSE = "GPLv3"
+        </literallayout>
+    </note>
+
     <itemizedlist>
             <listitem>
                 <para>

diff --git a/documentation/poky-ref-manual/usingpoky.xml b/documentation/poky-ref-manual/usingpoky.xml
index 75932665a35cb261032f2e5a90b478e4e675b89e..92e3ed5a468d2934d4bc9d640df1b2d5d0e38ef2 100644 (file)
--- a/documentation/poky-ref-manual/usingpoky.xml
+++ b/documentation/poky-ref-manual/usingpoky.xml
@@ -151,13 +151,18 @@
     </para>
     <para>
         The target is the name of the recipe you want to build. 
-        Common targets are the images in <filename>meta/recipes-core/images</filename>),
+        Common targets are the images in <filename>meta/recipes-core/images</filename>,
         <filename>/meta/recipes-sato/images</filename>, etc.
         Or, the target can be the name of a recipe for a specific piece of software such as 
         <application>busybox</application>. 
         For more details about the standard images available, see the 
         <link linkend="ref-images">'Reference: Images'</link> appendix.
     </para>
+    <note>
+        Building an image without GNU Public License Version 3 (GPLv3) components is 
+        only supported for minimal and base images.
+        See <link linkend='ref-images'>'Reference: Images'</link> for more information.
+    </note>
 </section>
 
 <section id='usingpoky-install'>