From 2effece91b9374c4a655bb317fc4cf80c4ae40d8 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Wed, 18 Sep 2013 11:06:45 -0700
Subject: ref-manual, mega-manual: Updates to the SDK Generation section

Fixes [YOCTO #2808]

I updated the figure to not call out the SDK environment setup
script as it is part of the .sh file.  The figure was placed
in the "figures" directory of the ref-manual and the
mega-manual.

Also, I removed the duplicated variable descriptions and referenced
these descriptions in the "Application Development SDK" section,
which is further down in the manual.  The descriptions have more
to do with where output is placed.

(From yocto-docs rev: 256bb1447b571299b57c657bf030d5b4f033fb5f)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../mega-manual/figures/sdk-generation.png         | Bin 46703 -> 45456 bytes
 documentation/ref-manual/closer-look.xml           |  41 ++++-----------------
 .../ref-manual/figures/sdk-generation.png          | Bin 46703 -> 45456 bytes
 3 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/documentation/mega-manual/figures/sdk-generation.png b/documentation/mega-manual/figures/sdk-generation.png
index 9e7fd9a75d..c37e2748ca 100644
Binary files a/documentation/mega-manual/figures/sdk-generation.png and b/documentation/mega-manual/figures/sdk-generation.png differ
diff --git a/documentation/ref-manual/closer-look.xml b/documentation/ref-manual/closer-look.xml
index 0947340c07..eccf97698a 100644
--- a/documentation/ref-manual/closer-look.xml
+++ b/documentation/ref-manual/closer-look.xml
@@ -981,8 +981,7 @@
 
             <para>
                 The OpenEmbedded build system uses BitBake to generate the
-                Software Development Kit (SDK) installer script and the
-                cross-development environment setup script:
+                Software Development Kit (SDK) installer script:
                 <imagedata fileref="figures/sdk-generation.png" align="center" width="6in" depth="7in" />
             </para>
 
@@ -998,36 +997,10 @@
                 several stages and depends on many variables.
                 The <filename>do_populate_sdk</filename> task uses these
                 key variables to help create the list of packages to actually
-                install:
-                <itemizedlist>
-                    <listitem><para><link linkend='var-DEPLOY_DIR'><filename>DEPLOY_DIR</filename></link>:
-                        Points to the <filename>deploy</filename>
-                        directory.</para></listitem>
-                    <listitem><para><link linkend='var-SDKMACHINE'><filename>SDKMACHINE</filename></link>:
-                        Specifies the architecture of the machine
-                        on which the cross-development tools are run to
-                        create packages for the target hardware.
-                        </para></listitem>
-                    <listitem><para><link linkend='var-SDKIMAGE_FEATURES'><filename>SDKIMAGE_FEATURES</filename></link>:
-                        Lists the features to include in the "target" part
-                        of the SDK.
-                        </para></listitem>
-                    <listitem><para><link linkend='var-TOOLCHAIN_HOST_TASK'><filename>TOOLCHAIN_HOST_TASK</filename></link>:
-                        Lists packages that make up the host
-                        part of the SDK (i.e. the part that runs on
-                        the <filename>SDKMACHINE</filename>).
-                        When you use
-                        <filename>bitbake -c populate_sdk &lt;imagename&gt;</filename>
-                        to create the SDK, a set of default packages
-                        apply.
-                        This variable allows you to add more packages.
-                        </para></listitem>
-                    <listitem><para><link linkend='var-TOOLCHAIN_TARGET_TASK'><filename>TOOLCHAIN_TARGET_TASK</filename></link>:
-                        Lists packages that make up the target part
-                        of the SDK (i.e. the part built for the
-                        target hardware).
-                        </para></listitem>
-                </itemizedlist>
+                install.
+                For information on the variables listed in the figure, see the
+                "<link linkend='sdk-dev-environment'>Application Development SDK</link>"
+                section.
             </para>
 
             <para>
@@ -1050,8 +1023,8 @@
 
             <para>
                 The final output of the task is the Cross-development
-                toolchain installation script (<filename>.sh</filename> file)
-                and the environment setup script.
+                toolchain installation script (<filename>.sh</filename> file),
+                which includes the environment setup script.
             </para>
         </section>
     </section>
diff --git a/documentation/ref-manual/figures/sdk-generation.png b/documentation/ref-manual/figures/sdk-generation.png
index 9e7fd9a75d..c37e2748ca 100644
Binary files a/documentation/ref-manual/figures/sdk-generation.png and b/documentation/ref-manual/figures/sdk-generation.png differ
-- 
cgit v1.2.3-54-g00ecf