documentation/adt-manual/adt-eclipse.xml: Added missing section for plug-in

Discovered a missing section for installation of the Eclipse Yocto Plug-in.
This information is critical to the release.  Jessica discovered the problem.
New section added that describes how to install the plug-in as a standard
"New Software" installation from within the Eclipse IDE.

(From yocto-docs rev: d4976ec56d39813a72519387897023f65a5884f6)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake/lib/bb/build.py

@@ -223,7 +223,7 @@ def exec_func_shell(function, d, runfile, cwd=None):
 
     with open(runfile, 'w') as script:
         script.write('#!/bin/sh -e\n')
-        if bb.msg.loggerVerbose:
+        if bb.msg.loggerDefaultVerbose:
             script.write("set -x\n")
         data.emit_func(function, script, d)
         if cwd:
@@ -234,7 +234,7 @@ def exec_func_shell(function, d, runfile, cwd=None):
 
     cmd = runfile
 
-    if bb.msg.loggerVerbose:
+    if bb.msg.loggerDefaultVerbose:
         logfile = LogTee(logger, sys.stdout)
     else:
         logfile = sys.stdout

bitbake/lib/bb/msg.py

@@ -106,8 +106,8 @@ def init_msgconfig(verbose, debug, debug_domains = []):
     """
     Set default verbosity and debug levels config the logger
     """
-    bb.msg.loggerDebugLevel = debug
-    bb.msg.loggerVerbose = verbose
+    bb.msg.loggerDefaultDebugLevel = debug
+    bb.msg.loggerDefaultVerbose = verbose
     bb.msg.loggerDefaultDomains = debug_domains
 
 def addDefaultlogFilter(handler):

bitbake/lib/bb/ui/crumbs/hobeventhandler.py

@@ -88,6 +88,8 @@ class HobHandler(gobject.GObject):
         deploy_dir = self.server.runCommand(["getVariable", "DEPLOY_DIR"])
         self.image_out_dir = os.path.join(deploy_dir, "images")
         self.image_output_types = self.server.runCommand(["getVariable", "IMAGE_FSTYPES"]).split(" ")
+        self.bbpath = self.server.runCommand(["getVariable", "BBPATH"])
+        self.bbfiles = self.server.runCommand(["getVariable", "BBFILES"])
 
     def run_next_command(self):
         if self.current_command and not self.generating:
@@ -263,8 +265,7 @@ class HobHandler(gobject.GObject):
         self.build_queue = targets
 
         if not self.bbpath_ok:
-            bbpath = self.server.runCommand(["getVariable", "BBPATH"])
-            if self.image_dir in bbpath.split(":"):
+            if self.image_dir in self.bbpath.split(":"):
                 self.bbpath_ok = True
             else:
                 nbbp = self.image_dir
@@ -272,8 +273,8 @@ class HobHandler(gobject.GObject):
         if not self.bbfiles_ok:
             import re
             pattern = "%s/\*.bb" % self.image_dir
-            bbfiles = self.server.runCommand(["getVariable", "BBFILES"]).split(" ")
-            for files in bbfiles:
+
+            for files in self.bbfiles.split(" "):
                 if re.match(pattern, files):
                     self.bbfiles_ok = True
 
@@ -327,7 +328,7 @@ class HobHandler(gobject.GObject):
         return self.image_output_types
 
     def get_image_deploy_dir(self):
-        return self.img_out_dir
+        return self.image_out_dir
 
     def make_temp_dir(self):
         bb.utils.mkdirhier(self.image_dir)

bitbake/lib/bb/ui/hob.py

@@ -304,13 +304,11 @@ class MainWindow (gtk.Window):
                 self.image_combo.disconnect(self.image_combo_id)
                 self.image_combo_id = None
             self.model.set_selected_image(self.selected_image)
-            self.selected_image = None
             if not self.image_combo_id:
                 self.image_combo_id = self.image_combo.connect("changed", self.image_changed_cb)
 
         if self.selected_packages:
             self.model.set_selected_packages(self.selected_packages)
-            self.selected_packages = None
 
     def reset_clicked_cb(self, button):
         lbl = "<b>Reset your selections?</b>\n\nAny new changes you have made will be lost"
@@ -398,8 +396,10 @@ class MainWindow (gtk.Window):
                                                  gtk.RESPONSE_OK))
         response  = chooser.run()
         rep = BuildRep(None, None, None)
+        recipe = chooser.get_filename()
         if response == gtk.RESPONSE_OK:
-            rep.loadRecipe(chooser.get_filename())
+            rep.loadRecipe(recipe)
+            self.save_path = recipe
         chooser.destroy()
         self.model.load_image_rep(rep)
         self.dirty = False

documentation/Makefile

@@ -69,7 +69,8 @@ ALLPREQ = html pdf tarball
 TARFILES = style.css dev-manual.html dev-manual.pdf figures/bsp-dev-flow.png figures/dev-title.png \
            figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \
            figures/kernel-example-repos.png figures/kernel-overview-1.png figures/kernel-overview-2.png \
-           figures/kernel-overview-3.png figures/source-repos.png figures/yp-download.png
+           figures/kernel-overview-3.png figures/source-repos.png figures/yp-download.png \
+           figures/wip.png
 MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf
 FIGURES = figures
 STYLESHEET = $(DOC)/*.css

documentation/adt-manual/adt-command.xml

@@ -28,7 +28,7 @@
 <title>Autotools-Based Projects</title>
 
     <para>
-        For an autotools-based project, you can use the cross-toolchain by just 
+        For an Autotools-based project, you can use the cross-toolchain by just 
         passing the appropriate host option to <filename>configure.sh</filename>.
         The host option you use is derived from the name of the environment setup 
         script in <filename>/opt/poky</filename> resulting from unpacking the 
@@ -47,6 +47,20 @@
         This single command updates your project and rebuilds it using the appropriate 
         cross-toolchain tools.
     </para>
+    <note>
+        If <filename>configure</filename> script results in problems recognizing the 
+        <filename>--with-libtool-sysroot=&lt;sysroot-dir&gt;</filename> option, 
+        regenerate the script to enable the support by doing the following and then 
+        re-running the script:
+        <literallayout class='monospaced'>
+     $ libtoolize --automake
+     $ aclocal -I ${OECORE_NATIVE_SYSROOT}/usr/share/aclocal \
+        [-I &lt;dir_containing_your_project-specific_m4_macros&gt;]
+     $ autoconf
+     $ autoheader
+     $ automake -a
+        </literallayout>
+    </note>       
 </section>
 
 <section id='makefile-based-projects'>

documentation/adt-manual/adt-eclipse.xml

@@ -29,8 +29,7 @@
     <para>
         To develop within the Eclipse IDE, you need to do the following:
         <orderedlist>
-            <listitem><para>Be sure the optimal version of the Eclipse IDE 
-                is installed.</para></listitem>
+            <listitem><para>Install the optimal version of the Eclipse IDE.</para></listitem>
             <listitem><para>Configure the Eclipse IDE.</para></listitem>
             <listitem><para>Install the Eclipse Yocto Plug-in.</para></listitem>
             <listitem><para>Configure the Eclipse Yocto Plug-in.</para></listitem>
@@ -55,7 +54,7 @@
             Once you have downloaded the tarball, extract it into a clean 
             directory.
             For example, the following command unpacks and installs the Eclipse IDE
-            into a clean directory named <filename>eclipse</filename>:
+            into a clean directory using the default name <filename>eclipse</filename>:
             <literallayout class='monospaced'>
      $ tar -xzvf ~/Downloads/Eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz
             </literallayout>
@@ -96,16 +95,18 @@
             Follow these general steps to configure Eclipse:
             <orderedlist>
                 <listitem><para>Start the Eclipse IDE.</para></listitem>
-                <listitem><para>Select "Install New Software" from the "Help" pull-down menu.
+                <listitem><para>Make sure you are in your Workbench and select 
+                    "Install New Software" from the "Help" pull-down menu.
                     </para></listitem>
-                <listitem><para>Select <filename>Indego - http://download.eclipse.org/releases/indego</filename>
+                <listitem><para>Select <filename>indigo - http://download.eclipse.org/releases/indigo</filename>
                     from the "Work with:" pull-down menu.</para></listitem>
                 <listitem><para>Expand the box next to <filename>Programming Languages</filename>
                     and select the <filename>Autotools Support for CDT (incubation)</filename>
                     and <filename>C/C++ Development Tools</filename> boxes.</para></listitem>
                 <listitem><para>Complete the installation and restart the Eclipse IDE.</para></listitem>
-                <listitem><para>Select "Install New Software" from the "Help" pull-down menu.</para></listitem>
-                <listitem><para>After the Eclipse IDE restarts, click the 
+                <listitem><para>After the Eclipse IDE restarts and from the Workbench, select 
+                    "Install New Software" from the "Help" pull-down menu.</para></listitem>
+                <listitem><para>Click the 
                     "Available Software Sites" link.</para></listitem>
                 <listitem><para>Check the box next to 
                     <filename>http://download.eclipse.org/tm/updates/3.3</filename>
@@ -118,12 +119,13 @@
                     and select every item except <filename>RSE Unit Tests</filename> and 
                     <filename>RSE WinCE Services (incubation)</filename>.</para></listitem>
                 <listitem><para>Complete the installation and restart the Eclipse IDE.</para></listitem>
-                <listitem><para>After the Eclipse IDE restarts, click the 
-                    "Available Software Sites" link.</para></listitem>
-                <listitem><para>Check the box next to 
-                    <filename>http://download.eclipse.org/tools/cdt/releases/indego</filename>
+                <listitem><para>If necessary, select 
+                    "Install New Software" from the "Help" pull-down menu so you can click the 
+                    "Available Software Sites" link again.</para></listitem>
+                <listitem><para>After clicking "Available Software Sites", check the box next to 
+                    <filename>http://download.eclipse.org/tools/cdt/releases/indigo</filename>
                     and click "OK".</para></listitem>
-                <listitem><para>Select <filename>http://download.eclipse.org/tools/cdt/releases/indego</filename>
+                <listitem><para>Select <filename>http://download.eclipse.org/tools/cdt/releases/indigo</filename>
                     from the "Work with:" pull-down menu.</para></listitem>
                 <listitem><para>Check the box next to <filename>CDT Main Features</filename>.
                     </para></listitem>
@@ -139,36 +141,128 @@
     <title>Installing the Eclipse Yocto Plug-in</title>
 
         <para>
-            To install the Eclipse Yocto Plug-in, follow these special steps.  
-            The steps are WIP and are not final. 
-            Once they are final they will be replaced with the actual steps:
-            <orderedlist>
-                <listitem><para>Open a shell and create a Git repository with:
-                    <literallayout class='monospaced'>
-     $ git clone git://git.yoctoproject.org/yocto-eclipse yocto-eclipse
-                    </literallayout></para></listitem>
-                <listitem><para>In Eclipse, select "Import" from the "File" menu.</para></listitem>
-                <listitem><para>Expand the "General" box and pick "existing projects into workspace".
-                    </para></listitem>
-                <listitem><para>Select the root directory and browse to "~/yocto-eclipse/plugins".
-                    </para></listitem>
-                <listitem><para>There will be three things there.
-                    Select each one and install one at a time.
-                    Do all three.</para></listitem>
-                <listitem><para>Restart everything.</para></listitem>
-            </orderedlist>
+            You can install the Eclipse Yocto Plug-in one of three methods: as new software
+            from within the Eclipse IDE, from the Yocto Project source repositories, or as a built zip file.
         </para>
 
-        <para>
-            At this point I should be able to invoke Eclipse from the shell using the following:
-                    <literallayout class='monospaced'>
+        <section id='new-software'>
+        <title>New Software</title>
+
+            <para>
+                To install the Eclipse Yocto Plug-in directly into the Eclipse IDE, 
+                follow these steps:
+                <orderedlist>
+                    <listitem><para>Start up the Eclipse IDE.</para></listitem>
+                    <listitem><para>In Eclipse, select "Install New Software" from the "Help" menu.</para></listitem>
+                    <listitem><para>Click "Add..." in the "Work with:" area.</para></listitem>
+                    <listitem><para>Enter 
+                        <filename>http://www.yoctoproject.org/downloads/eclipse-plugin/1.1</filename> 
+                        in the URL field and provide a meaningful name in the "Name" field.</para></listitem>
+                    <listitem><para>Click "OK" to have the entry added to the "Work with:" 
+                        drop-down list.</para></listitem>
+                    <listitem><para>Select the entry for the plug-in from the "Work with:" drop-down 
+                        list.</para></listitem>
+                    <listitem><para>Complete the remaining software installation steps and 
+                        then restart the Eclipse IDE to finish the installation of the plug-in.
+                        </para></listitem>
+                </orderedlist>
+            </para>
+        </section>
+
+
+        <section id='yocto-project-source'>
+        <title>Yocto Project Source</title>
+
+            <para>
+                To install the Eclipse Yocto Plug-in from the Yocto Project source repositories, 
+                follow these steps:
+                <orderedlist>
+                    <listitem><para>Open a shell and create a Git repository with:
+                        <literallayout class='monospaced'>
+     $ git clone git://git.yoctoproject.org/eclipse-poky yocto-eclipse
+                        </literallayout>
+                        For this example, the repository is named 
+                        <filename>~/yocto-eclipse</filename>.</para></listitem>
+                    <listitem><para>In Eclipse, select "Import" from the "File" menu.</para></listitem>
+                    <listitem><para>Expand the "General" box and pick "existing projects into workspace".
+                        </para></listitem>
+                    <listitem><para>Select the root directory and browse to "~/yocto-eclipse/plugins".
+                        </para></listitem>
+                    <listitem><para>There will be three things there.
+                        Select each one and install one at a time.
+                        Do all three.</para></listitem>
+                    <listitem><para>Restart everything.</para></listitem>
+                </orderedlist>
+            </para>
+
+            <para>
+                At this point you should be able to invoke Eclipse from the shell using the following:
+                <literallayout class='monospaced'>
      $ cd ~/eclipse
      $ ./eclipse -vmargs -XX:PermSize=256M
-                    </literallayout>
-            What is shown is the default projects in the left pane. 
-            I should be able to right-click on one of these and run as an Eclipse application to 
-           bring up the Eclipse instance again with the Eclipse Yocto Plug-in working.
-       </para>            
+                </literallayout>
+                The left navigation pane shows the default projects. 
+                Right-click on one of these projects and run it as an Eclipse application.
+                This brings up a second instance of Eclipse IDE that has the Yocto Plug-in.
+           </para>
+       </section>
+
+       <section id='zip-file-method'>
+       <title>Zip File Method</title>
+            <para>
+                To install the Eclipse Yocto Plug-in by building and installing a plug-in 
+                zip file, follow these steps:
+                <orderedlist>
+                    <listitem><para>Open a shell and create a Git repository with:
+                        <literallayout class='monospaced'>
+     $ git clone git://git.yoctoproject.org/eclipse-poky yocto-eclipse
+                        </literallayout>
+                        For this example, the repository is named     
+                        <filename>~/yocto-eclipse</filename>.</para></listitem>
+                    <listitem><para>Locate the <filename>build.sh</filename> script in the 
+                        Git repository you created in the previous step.
+                        The script is located in the <filename>scripts</filename>.</para></listitem>
+                    <listitem><para>Be sure to set and export the <filename>ECLIPSE_HOME</filename> environment
+                        variable to the top-level directory in which you installed the Indigo  
+                        version of Eclipse.
+                        For example, if your Eclipse directory is <filename>$HOME/eclipse</filename>, 
+                        use the following:
+                        <literallayout class='monospaced'>
+     $ export ECLIPSE_HOME=$HOME/eclipse
+                        </literallayout></para></listitem>
+                    <listitem><para>Run the <filename>build.sh</filename> script and provide the 
+                        name of the Git branch along with the Yocto Project release you are 
+                        using.
+                        Here is an example that uses the <filename>master</filename> Git repository
+                        and the <filename>1.1M4</filename> release:
+                        <literallayout class='monospaced'>
+     $ scripts/build.sh master 1.1M4 
+                        </literallayout>
+                        After running the script, the file
+                        <filename>org.yocto.sdk-&lt;release&gt;-&lt;date&gt;-archive.zip</filename>
+                        is in the current directory.</para></listitem>
+                    <listitem><para>If necessary, start the Eclipse IDE and be sure you are in the 
+                        Workbench.</para></listitem>
+                    <listitem><para>Select "Install New Software" from the "Help" pull-down menu.
+                        </para></listitem>
+                    <listitem><para>Click "Add".</para></listitem>
+                    <listitem><para>Provide anything you want in the "Name" field.</para></listitem>
+                    <listitem><para>For the "Archive" field, select the ZIP file you built in step 
+                        4.
+                        This ZIP file should not be "unzipped", and must be the 
+                        <filename>*archive.zip</filename> file created by running the 
+                        <filename>build.sh</filename> script.</para></listitem>
+                    <listitem><para>Select the new entry in the installation window and complete
+                        the installation.</para></listitem>
+                    <listitem><para>Restart the Eclipse IDE if necessary.</para></listitem>
+                </orderedlist>
+            </para>
+
+            <para>
+                At this point you should be able to configure the Eclipse Yocto Plug-in as described in
+                the next section.
+           </para>
+       </section>            
     </section>
 
     <section id='configuring-the-eclipse-yocto-plug-in'>
@@ -186,7 +280,7 @@
             To start, you need to do the following from within the Eclipse IDE:
             <itemizedlist>
                 <listitem><para>Choose <filename>Windows -&gt; Preferences</filename> to display 
-                    the Preferences Dialog</para></listitem>
+                    the <filename>Preferences</filename> Dialog</para></listitem>
                 <listitem><para>Click <filename>Yocto ADT</filename></para></listitem>
             </itemizedlist>
         </para>
@@ -223,12 +317,12 @@
                         </para></listitem>
                     <listitem><para><emphasis>Point to the Toolchain:</emphasis>
                         If you are using a stand-alone pre-built toolchain, you should be pointing to the
-                        <filename>/opt/poky/$SDKVERSION</filename> directory.
+                        <filename>/opt/poky/1.1</filename> directory.
                         This is the location for toolchains installed by the ADT Installer or by hand.
-                        Sections <link linkend='configuring-and-running-the-adt-installer-script'>
-                        Configuring and Running the ADT Installer Script</link> and 
-                        <link linkend='using-an-existing-toolchain-tarball'>
-                        Using a Cross-Toolchain Tarball</link> describe two ways to install
+                        Sections "<link linkend='configuring-and-running-the-adt-installer-script'>Configuring 
+                        and Running the ADT Installer Script</link>" and 
+                        "<link linkend='using-an-existing-toolchain-tarball'>Using a Cross-Toolchain 
+                        Tarball</link>" describe two ways to install
                         a stand-alone cross-toolchain in the 
                         <filename>/opt/poky</filename> directory.
                         <note>It is possible to install a stand-alone cross-toolchain in a directory
@@ -237,8 +331,8 @@
                         <para>If you are using a system-derived toolchain, the path you provide 
                         for the <filename>Toolchain Root Location</filename>
                         field is the Yocto Project's build directory.
-                        See section <link linkend='using-the-toolchain-from-within-the-build-tree'>
-                        Using BitBake and the Yocto Project Build Tree</link> for 
+                        See section "<link linkend='using-the-toolchain-from-within-the-build-tree'>Using 
+                        BitBake and the Yocto Project Build Tree</link>" for 
                         information on how to install the toolchain into the Yocto 
                         Project build tree.</para></listitem> 
                     <listitem><para><emphasis>Specify the Sysroot Location:</emphasis>
@@ -255,8 +349,7 @@
                         The pull-down menu should have the supported architectures.  
                         If the architecture you need is not listed in the menu, you 
                         will need to build the image.
-                        See the 
-                        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'> Building an Image</ulink> section of the  
+                        See the "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'>Building an Image</ulink>" section of the  
                         <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
                         The Yocto Project Quick Start</ulink> for more information.</para></listitem>
                 </itemizedlist>
@@ -350,21 +443,24 @@
 <title>Configuring the Cross-Toolchains</title>
 
     <para>
-        The previous section, "<link linkend='configuring-the-eclipse-yocto-plug-in'>
-        Configuring the Eclipse Yocto Plug-in</link>", set up the default project 
+        The earlier section, "<link linkend='configuring-the-eclipse-yocto-plug-in'>Configuring 
+        the Eclipse Yocto Plug-in</link>", sets up the default project 
         configurations.  
-        You can change these settings for a given project by following these steps:
+        You can override these settings for a given project by following these steps:
         <orderedlist>
-            <listitem><para>Select <filename>Window -&gt; Preferences</filename>:  
-                This selection brings up the <filename>Preferences</filename> Dialog.  
-                If the Yocto ADT Preferences are not automatically displayed, you can navigate to 
-                that dialog by selection <filename>Yocto ADT</filename> in the left-hand 
-                panel.</para>
-                <para>Yocto ADT Settings are inherited from the default project configuration.  
-                The information in this dialog is identical to that chosen earlier 
-                for the Cross Compiler Options and Target Options as described in 
-                <link linkend='configuring-the-eclipse-yocto-plug-in'>
-                Configuring the Eclipse Yocto Plug-in</link> section.</para></listitem>
+            <listitem><para>Select <filename>Project -&gt; Change Yocto Project Settings</filename>:  
+                This selection brings up the <filename>Project Yocto Settings</filename> Dialog
+                and allows you to make changes specific to an individual project.  
+                </para>
+                <para>By default, the Cross Compiler Options and Target Options for a project
+                are inherited from settings you provide using the <filename>Preferences</filename>
+                Dialog as described earlier 
+                in the "<link linkend='configuring-the-eclipse-yocto-plug-in'>Configuring the Eclipse 
+                Yocto Plug-in</link>" section.
+                The <filename>Project Yocto Settings</filename>
+                Dialog allows you to override those default settings
+                for a given project.</para></listitem>
+            <listitem><para>Make your configurations for the project and click "OK".</para></listitem>
             <listitem><para>Select <filename>Project -&gt; Reconfigure Project</filename>:   
                 This selection reconfigures the project by running
                 <filename>autogen.sh</filename> in the workspace for your project.  
@@ -391,20 +487,20 @@
     <para>
         To start the QEMU emulator from within Eclipse, follow these steps:
         <orderedlist>
-            <listitem><para>Expose the <filename>Run -&gt; External Tools -&gt; External Tools 
-                Configurations...</filename> menu.
+            <listitem><para>Expose the <filename>Run -&gt; External Tools</filename> menu.
                 Your image should appear as a selectable menu item.
                 </para></listitem>
-            <listitem><para>Select your image from the menu.
-                Doing so launches a new window.</para></listitem>
-            <listitem><para>Enter your host root password in the shell window at the prompt.  
+            <listitem><para>Select your image in the navigation pane to launch the 
+                emulator in a new window.</para></listitem>
+            <listitem><para>If needed, enter your host root password in the shell window at the prompt.  
                 This sets up a <filename>Tap 0</filename> connection needed for running in user-space 
                 NFS mode.</para></listitem>
             <listitem><para>Wait for QEMU to launch.</para></listitem>
-            <listitem><para>Once QEMU launches you need to determine the IP Address 
-                for the user-space NFS.  
-                You can do that by going to a terminal in the QEMU and entering the 
-            <filename>ifconfig</filename> command.</para></listitem>
+            <listitem><para>Once QEMU launches, you can begin operating within that 
+                environment.
+                For example, you could determine the IP Address 
+                for the user-space NFS by using the <filename>ifconfig</filename> command.
+                </para></listitem>
         </orderedlist>
     </para>
 </section>
@@ -435,8 +531,8 @@
             <listitem><para>Click <filename>Next</filename>.</para></listitem>
             <listitem><para>Clear out the <filename>host name</filename> field and enter the IP Address 
                 determined earlier.</para></listitem>
-            <listitem><para>Click <filename>Finish</filename> to close the new connections 
-                Dialog.</para></listitem>
+            <listitem><para>Click <filename>Finish</filename> to close the 
+                <filename>New Connections</filename> Dialog.</para></listitem>
             <listitem><para>Use the drop-down menu now in the <filename>Connection</filename> field and pick 
                 the IP Address you entered.</para></listitem>
             <listitem><para>Click <filename>Debug</filename> to bring up a login screen 

documentation/adt-manual/adt-manual.xml

@@ -31,12 +31,17 @@
             <revision>
                 <revnumber>1.0</revnumber>
                 <date>6 April 2011</date>
-                <revremark>Initial Document released with Yocto Project 1.0 on 6 April 2011.</revremark>
+                <revremark>Released with the Yocto Project 1.0 Release.</revremark>
             </revision>
             <revision>
                 <revnumber>1.0.1</revnumber>
                 <date>23 May 2011</date>
-                <revremark>Released with Yocto Project 1.0.1 on 23 May 2011.</revremark>
+                <revremark>Released with the Yocto Project 1.0.1 Release.</revremark>
+            </revision>
+            <revision>
+                <revnumber>1.1</revnumber>
+                <date>6 October 2011</date>
+                <revremark>Released with the Yocto Project 1.1 Release.</revremark>
             </revision>
         </revhistory>
 

documentation/adt-manual/adt-prepare.xml

@@ -9,60 +9,9 @@
     In order to use the ADT, you must install it, <filename>source</filename> a script to set up the 
     environment, and be sure both the kernel and filesystem image specific to the target architecture 
     exist. 
+    This chapter describes how to be sure you meet the ADT requirements.
 </para>
 
-<para> 
-    This chapter describes two important terms and how to be sure you meet the ADT requirements.
-</para>
-
-<section id='yocto-project-files'>
-    <title>Yocto Project Files and Build Areas</title>
-
-    <para>
-        Before learning how to prepare your system for the ADT, you need to understand
-        two important terms used throughout this manual:
-        <itemizedlist>
-            <listitem><para><emphasis>The Yocto Project Files:</emphasis>
-                This term refers to the directory structure created as a result of downloading 
-                and unpacking a Yocto Project release tarball or setting up a Git repository
-                by cloning <filename>git://git.yoctoproject.org/poky</filename>.</para>
-                <para>The Yocto Project files contain BitBake, Documentation, metadata and 
-                other files that all support the development environment. 
-                Consequently, you must have the Yocto Project files in place on your development 
-                system in order to do any development using the Yocto Project.</para>
-                <para>The name of the top-level directory of the Yocto Project file structure  
-                is derived from the Yocto Project release tarball.
-                For example, downloading and unpacking <filename>poky-edison-6.0.tar.bz2</filename>
-                results in a Yocto Project source tree whose Yocto Project source directory is named 
-                <filename>poky-edison-6.0</filename>.
-                If you create a Git repository, then you can name the repository anything you like.</para>
-                <para>You can find instruction on how to set up the Yocto Project files on your 
-                host development system by reading the 
-                <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#getting-setup'>
-                Getting Setup</ulink> section in
-                <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>
-                The Yocto Project Development Manual</ulink>.</para></listitem>
-            <listitem><para><emphasis>Yocto Project Build Tree:</emphasis>
-                This term refers to the area where the Yocto Project builds images.  
-                The area is created when you <filename>source</filename> the Yocto Project setup 
-                environment script that is found in the Yocto Project files area. 
-                (e.g. <filename>oe-init-build-env</filename>).
-                You can create the Yocto Project build tree anywhere you want on your 
-                development system.
-                Here is an example that creates the tree in <filename>mybuilds</filename> 
-                and names the Yocto Project build directory <filename>YP-6.0</filename>:
-                <literallayout class='monospaced'> 
-     $ source poky-edison-6.0/oe-init-build-env $HOME/mybuilds/YP-6.0
-                </literallayout>
-                If you don't specifically name the build directory, then BitBake creates it 
-                in the current directory and uses the name <filename>build</filename>.
-                Also, if you supply an existing directory, then BitBake uses that 
-                directory as the Yocto Project build directory and populates the build tree
-                beneath it.</para></listitem>
-        </itemizedlist>
-    </para>
-</section>
-
 <section id='installing-the-adt'>
     <title>Installing the ADT</title>
 
@@ -70,7 +19,8 @@
         The following list describes how you can install the ADT, which includes the cross-toolchain.
         Regardless of the installation you choose, you must <filename>source</filename> the cross-toolchain
         environment setup script before you use the toolchain.
-        See the "<link linkend='setting-up-the-environment'>Setting Up the Environment</link>"
+        See the "<link linkend='setting-up-the-cross-development-environment'>Setting Up the 
+        Cross-Development Environment</link>"
         section for more information.
         <itemizedlist>
             <listitem><para><emphasis>Use the ADT Installer Script:</emphasis>
@@ -85,8 +35,8 @@
                 If you use this method, you just get the cross-toolchain and QEMU - you do not 
                 get any of the other mentioned benefits had you run the ADT Installer script.</para></listitem>
             <listitem><para><emphasis>Use the Toolchain from within a Yocto Project Build Tree:</emphasis>
-                If you already have a Yocto Project build tree, you can install the cross-toolchain 
-                using that tree.
+                If you already have a Yocto Project build tree, you can build the cross-toolchain 
+                within tree.
                 However, like the previous method mentioned, you only get the cross-toolchain and QEMU - you 
                 do not get any of the other benefits without taking separate steps.</para></listitem>
         </itemizedlist>
@@ -106,14 +56,15 @@
             <para>
                 The ADT Installer is contained in the ADT Installer tarball.
                 You can download the tarball into any directory from  
-                <ulink url='http://autobuilder.yoctoproject.org/downloads/yocto-1.1/adt-installer/'></ulink>.
+                <ulink url='http://www.yoctoproject.org/downloads/yocto-1.1/adt-installer/'></ulink>.
                 Or, you can use BitBake to generate the tarball inside the existing Yocto Project 
                 build tree.
             </para>
 
             <para>
                 If you use BitBake to generate the ADT Installer tarball, you must 
-                <filename>source</filename> the Yocto Project environment setup script located 
+                <filename>source</filename> the Yocto Project environment setup script 
+                (<filename>oe-init-build-env</filename>) located 
                 in the Yocto Project file structure before running the <filename>bitbake</filename>
                 command that creates the tarball.
             </para>
@@ -213,8 +164,8 @@
             <note>
                 The ADT Installer requires the <filename>libtool</filename> package to complete.  
                 If you install the recommended packages as described in the 
-                <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#packages'>
-                Packages</ulink> section of 
+                "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#packages'>Packages</ulink>"
+                section of 
                 <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
                 The Yocto Project Quick Start</ulink>, then you will have libtool installed.
             </note>
@@ -230,7 +181,7 @@
             <para>
                 Once the installation completes, the ADT, which includes the cross-toolchain, is installed.
                 You will notice environment setup files for the cross-toolchain in 
-                <filename>/opt/poky/$SDKVERSION</filename>,
+                <filename>/opt/poky/1.1</filename>,
                 and image tarballs in the <filename>adt-installer</filename>
                 directory according to your installer configurations, and the target sysroot located
                 according to the <filename>YOCTOADT_TARGET_SYSROOT_LOC_&lt;arch&gt;</filename> variable
@@ -245,64 +196,70 @@
         <para>
             If you want to simply install the cross-toolchain by hand, you can do so by using an existing 
             cross-toolchain tarball.  
-            If you install the cross-toolchain by hand, you will have to set up the target sysroot separately.
+            If you use this method to install the cross-toolchain and you still need to install the target 
+            sysroot, you will have to install sysroot separately.
         </para>
 
         <para>
             Follow these steps:
             <orderedlist>
                 <listitem><para>Go to  
-                    <ulink url='http://autobuilder.yoctoproject.org/downloads/yocto-1.1/toolchain'></ulink> 
+                    <ulink url='http://www.yoctoproject.org/downloads/yocto-1.1/toolchain'></ulink> 
                     and find the folder that matches your host development system 
-                    (i.e. <filename>i686</filename> for 32-bit machines or 
+                    (i.e. <filename>i586</filename> for 32-bit machines or 
                     <filename>x86_64</filename> for 64-bit machines).</para></listitem>
                 <listitem><para>Go into that folder and download the toolchain tarball whose name 
                     includes the appropriate target architecture.
                     For example, if your host development system is an Intel-based 64-bit system and 
-                    you are going to use your cross-toolchain for an ARM-based target, go into the 
+                    you are going to use your cross-toolchain for an Intel-based 32-bit target, go into the 
                     <filename>x86_64</filename> folder and download the following tarball:
                     <literallayout class='monospaced'>
-     yocto-eglibc-x86_64-arm-toolchain-gmae-1.1.tar.bz2
-                   </literallayout>
-                    <note>As an alternative to steps one and two, you can build the toolchain tarball 
+     yocto-eglibc-x86_64-i586-toolchain-1.1.tar.bz2
+                    </literallayout>
+                    <note><para>As an alternative to steps one and two, you can build the toolchain tarball 
                         if you have a Yocto Project build tree.
-                        Use the <filename>bitbake meta-toolchain</filename> command after you have 
-                        sourced the <filename>oe-build-init script</filename> located in the Yocto 
+                        If you need GMAE, you should use the <filename>bitbake meta-toolchain-gmae</filename>
+                        command. 
+                        The resulting tarball will support such development.
+                        However, if you are not concerned with GMAE, 
+                        you can generate the tarball using <filename>bitbake meta-toolchain</filename>.</para>
+                        <para>Use the appropriate <filename>bitbake</filename> command only after you have 
+                        sourced the <filename>oe-build-init-env</filename> script located in the Yocto 
                         Project files.  
-                        When the <filename>bitbake</filename> command completes, the toolchain tarball will 
+                        When the <filename>bitbake</filename> command completes, the tarball will 
                         be in <filename>tmp/deploy/sdk</filename> in the Yocto Project build tree.
-                        </note></para></listitem>
+                        </para></note></para></listitem>
                 <listitem><para>Make sure you are in the root directory with root privileges and then expand 
                     the tarball.  
-                    The tarball expands into <filename>/opt/poky/$SDKVERSION</filename>.
-                    Once the tarball in unpacked, the cross-toolchain is installed.
+                    The tarball expands into <filename>/opt/poky/1.1</filename>.
+                    Once the tarball is expanded, the cross-toolchain is installed.
                     You will notice environment setup files for the cross-toolchain in the directory.
                     </para></listitem>
             </orderedlist>
         </para>
-
-        <para>
-            After installing the toolchain, you must locate the target sysroot tarball and unpack it
-            into a location of your choice.
-        </para>  
     </section>
 
     <section id='using-the-toolchain-from-within-the-build-tree'>
         <title>Using BitBake and the Yocto Project Build Tree</title>
 
         <para>
-            A final way of installing just the cross-toolchain is to use BitBake within an existing 
-            Yocto Project build tree.
-            Follow these steps:
+            A final way of installing just the cross-toolchain is to use BitBake to build the 
+            toolchain within an existing Yocto Project build tree.
+            This method does not install the toolchain into the <filename>/opt</filename> directory.
+            As with the previous method, if you need to install the target sysroot, you must 
+            do this separately.
+        </para>
+
+        <para>
+            Follow these steps to build and install the toolchain into the build tree:
             <orderedlist>
-                <listitem><para>Source the environment setup script located in the Yocto Project
-                    files.
-                    The script has the string <filename>init-build-env</filename>
-                    as part of the name.</para></listitem> 
+                <listitem><para>Source the environment setup script 
+                    <filename>oe-init-build-env</filename> located in the Yocto Project
+                    files.</para></listitem> 
                 <listitem><para>At this point, you should be sure that the 
                     <filename>MACHINE</filename> variable 
-                    in the <filename>local.conf</filename> file found in the Yocto Project 
-                    file structure's <filename>conf</filename> directory 
+                    in the <filename>local.conf</filename> file found in the 
+                    <filename>conf</filename> directory of the Yocto Project build directory
                     is set for the target architecture.
                     Comments within the <filename>local.conf</filename> file list the values you 
                     can use for the <filename>MACHINE</filename> variable.  
@@ -313,39 +270,34 @@
                         command.</note></para></listitem>
                 <listitem><para>Run <filename>bitbake meta-ide-support</filename> to complete the 
                     cross-toolchain installation.
-                    <note>If you change your working directory after you 
+                    <note>If change out of your working directory after you 
                         <filename>source</filename> the environment setup script and before you run
-                        the BitBake command, the command will not work. 
+                        the <filename>bitbake</filename> command, the command might not work. 
                         Be sure to run the <filename>bitbake</filename> command immediately 
                         after checking or editing the <filename>local.conf</filename> but without 
-                        changing your working directory.</note>
-                    Once BitBake finishes, the cross-toolchain is installed.
+                        changing out of your working directory.</note>
+                    Once the <filename>bitbake</filename> command finishes, 
+                    the tarball for the cross-toolchain is generated within the Yocto Project build tree.
                     You will notice environment setup files for the cross-toolchain in the 
                     Yocto Project build tree in the <filename>tmp</filename> directory.
                     Setup script filenames contain the strings <filename>environment-setup</filename>.
                     </para></listitem>
             </orderedlist>
         </para>
-
-        <para>
-            After installing the toolchain, you must locate the target sysroot tarball and unpack
-            it in a directory of your choice.
-        </para>
     </section>
 </section>
 
-<section id='setting-up-the-environment'>
-    <title>Setting Up the Environment</title>
+<section id='setting-up-the-cross-development-environment'>
+    <title>Setting Up the Cross-Development Environment</title>
 
     <para>
-        Before you can use the cross-toolchain, you need to set up the toolchain environment by 
-        sourcing the environment setup script.  
+        Before you can develop using the cross-toolchain, you need to set up the 
+        cross-development environment by sourcing the toolchain's environment setup script.  
         If you used the ADT Installer or used an existing ADT tarball to install the ADT,
-        then you can find this script in the <filename>/opt/poky/$SDKVERSION</filename>
+        then you can find this script in the <filename>/opt/poky/1.1</filename>
         directory.  
-        If you used BitBake and the Yocto Project Build Tree to install the cross-toolchain,
-        then you can find the environment setup scripts in in the Yocto Project build tree 
-        in the <filename>tmp</filename> directory.
+        If you installed the toolchain in the build tree, you can find the environment setup 
+        script for the toolchain in the Yocto Project build tree's <filename>tmp</filename> directory.
     </para>
 
     <para> 
@@ -353,7 +305,7 @@
         which you are developing.  
         Environment setup scripts begin with the string “<filename>environment-setup</filename>”
         and include as part of their name the architecture.  
-        For example, the environment setup script for a 64-bit IA-based architecture would 
+        For example, the toolchain environment setup script for a 64-bit IA-based architecture would 
         be the following: 
         <literallayout class='monospaced'>
      /opt/poky/1.1/environment-setup-x86_64-poky-linux
@@ -361,35 +313,128 @@
     </para>
 </section>
 
-<section id='kernels-and-filesystem-images'>
-    <title>Kernels and Filesystem Images</title>
+<section id='securing-kernel-and-filesystem-images'>
+    <title>Securing Kernel and Filesystem Images</title>
 
     <para>
         You will need to have a kernel and filesystem image to boot using your 
-        hardware or the QEMU emulator.  
-        That means you either have to build them or know where to get them.
-        You can find a quick example of how to build an image in the 
-        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'>
-        Building an Image</ulink> section of   
-        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
-        The Yocto Project Quick Start</ulink>.
-        <note><para> 
-            The Yocto Project provides basic kernels and filesystem images for several 
+        hardware or the QEMU emulator.
+        Furthermore, if you plan on booting your image using NFS or you want to use the root filesystem
+        as the target sysroot, you need to extract the root filesystem.
+    </para>
+
+    <section id='getting-the-images'>
+        <title>Getting the Images</title>
+
+        <para>
+            To get the kernel and filesystem images, you either have to build them or download
+            pre-built versions.
+            You can find examples for both these situations in the 
+            "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#test-run'>A
+            Quick Test Run</ulink>" section of   
+            <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
+            The Yocto Project Quick Start</ulink>.
+        </para>
+
+        <para> 
+            The Yocto Project provides basic kernel and filesystem images for several 
             architectures (<filename>x86</filename>, <filename>x86-64</filename>, 
             <filename>mips</filename>, <filename>powerpc</filename>, and <filename>arm</filename>) 
             that you can use unaltered in the QEMU emulator.  
-            These kernels and filesystem images reside in the Yocto Project release 
-            area - <ulink url='http://autobuilder.yoctoproject.org/downloads/yocto-1.1/machines/'></ulink>
-            and are ideal for experimentation within Yocto Project.</para>
-            <para>If you plan on remotely deploying and debugging your application from within the 
-            Eclipse IDE, you must have an image that supports Sato.
-            For information on the image types you can build using the Yocto Project, see
-            <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>
-            Reference: Images</ulink> in  
+            These kernel images reside in the Yocto Project release 
+            area - <ulink url='http://www.yoctoproject.org/downloads/yocto-1.1/machines/'></ulink>
+            and are ideal for experimentation within Yocto Project.
+            For information on the image types you can build using the Yocto Project, see the
+            "<ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>Reference: Images</ulink>" appendix in  
             <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
-            The Yocto Project Reference Manual</ulink>.</para>
-        </note>
-    </para>
+            The Yocto Project Reference Manual</ulink>.
+        </para>
+
+        <para>
+            If you plan on remotely deploying and debugging your application from within the 
+            Eclipse IDE, you must have an image that contains the Yocto Target Communication
+            Framework (TCF) agent (<filename>tcf-agent</filename>). 
+            By default, the Yocto Project provides only one type pre-built image that contains the 
+            <filename>tcf-agent</filename>.
+            And, those images are SDK (e.g.<filename>core-image-sato-sdk</filename>).
+        </para>
+
+        <para>
+            If you want to use a different image type that contains the <filename>tcf-agent</filename>, 
+            you can do so one of two ways:
+            <itemizedlist>
+                <listitem><para>Modify the <filename>conf/local.conf</filename> configuration in 
+                    the Yocto Project build directory and then rebuild the image.
+                    With this method, you need to modify the <filename>EXTRA_IMAGE_FEATURES</filename>
+                    variable to have the value of "tools-debug" before rebuilding the image. 
+                    Once the image is rebuilt, the <filename>tcf-agent</filename> will be included
+                    in the image and is launched automatically after the boot.</para></listitem>
+                <listitem><para>Manually build the <filename>tcf-agent</filename>.
+                    To build the agent, follow these steps:
+                    <orderedlist>
+                        <listitem><para>Be sure the ADT is installed as described in the 
+                            "<link linkend='installing-the-adt'>Installing the ADT</link>" section.
+                            </para></listitem>
+                        <listitem><para>Set up the cross-development environment as described in the 
+                            "<link linkend='setting-up-the-cross-development-environment'>Setting 
+                            Up the Cross-Development Environment</link>" section.</para></listitem>
+                        <listitem><para>Get the <filename>tcf-agent</filename> source code, which is 
+                            stored using the Subversion SCM, using the following command:
+                            <literallayout class='monospaced'>
+     $ svn checkout svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk/agent \
+        &lt;-r #rev_number&gt;
+                            </literallayout></para></listitem>
+                        <listitem><para>Modify the <filename>Makefile.inc</filename> file
+                            for the cross-compilation environment by setting the 
+                            <filename>OPSYS</filename> and <filename>MACHINE</filename>
+                            variables according to your target.</para></listitem>
+                        <listitem><para>Use the cross-development tools to build the 
+                            <filename>tcf-agent</filename>.  
+                            Before you "Make" the file, be sure your cross-tools are set up first.
+                            See the "<link linkend='makefile-based-projects'>Makefile-Based Projects</link>"
+                            section for information on how to make sure the cross-tools are set up
+                            correctly.</para>
+                            <para>If the build is successful, the <filename>tcf-agent</filename> output will 
+                            be <filename>obj/$(OPSYS)/$(MACHINE)/Debug/agent</filename>.</para></listitem>
+                        <listitem><para>Deploy the agent into the image's root filesystem.</para></listitem>
+                    </orderedlist>
+                </para></listitem>
+            </itemizedlist>
+        </para>
+    </section>
+
+    <section id='extracting-the-root-filesystem'>
+        <title>Extracting the Root Filesystem</title>
+
+        <para>
+            You must extract the root filesystem if you want to boot the image using NFS
+            or you want to use the root filesystem as the target sysroot.
+            For example, the Eclipse IDE environment with the Eclipse Yocto Plug-in installed allows you 
+            to use QEMU to boot under NFS.
+            Another example is if you want to develop your target application using the
+            root filesystem as the target sysroot. 
+        </para>
+
+        <para> 
+            To extract the root filesystem, first <filename>source</filename>
+            the cross-development environment setup script and then 
+            use the <filename>runqemu-extract-sdk</filename> command on the 
+            filesystem image. 
+            For example, the following commands set up the environment and then extract
+            the root filesystem from a previously built filesystem image tarball named  
+            <filename>core-image-sato-sdk-qemux86-2011091411831.rootfs.tar.bz2</filename>.
+            The example extracts the root filesystem into the <filename>$HOME/qemux86-sato</filename>
+            directory:
+            <literallayout class='monospaced'>
+     $ source $HOME/poky/build/tmp/environment-setup-i586-poky-linux
+     $ runqemu-extract-sdk \
+        tmp/deploy/images/core-image-sato-sdk-qemux86-2011091411831.rootfs.tar.bz2 \
+        $HOME/qemux86-sato
+            </literallayout>
+            In this case, you could now point to the target sysroot at 
+            <filename>$HOME/qemux86-sato</filename>.
+        </para>
+    </section>
 </section>
 
 </chapter>

documentation/bsp-guide/bsp-guide.xml

@@ -19,10 +19,17 @@
 
         <authorgroup>
             <author>
-                <firstname>Richard</firstname> <surname>Purdie</surname>
+                <firstname>Tom</firstname> <surname>Zanussi</surname>
                 <affiliation>
                     <orgname>Intel Corporation</orgname>
                 </affiliation>
+                <email>tom.zanussi@intel.com</email>
+            </author>
+            <author>
+                <firstname>Richard</firstname> <surname>Purdie</surname>
+                <affiliation>
+                    <orgname>Linux Foundation</orgname>
+                </affiliation>
                 <email>richard.purdie@linuxfoundation.org</email>
             </author>
         </authorgroup>
@@ -30,19 +37,23 @@
         <revhistory>
             <revision>
                 <revnumber>0.9</revnumber>
-                <date>27 October 2010</date>
-                <revremark>This manual revision is the initial manual and corresponds to the 
-                    Yocto Project 0.9 Release.</revremark>
+                <date>24 November 2010</date>
+                <revremark>The initial document draft released with the Yocto Project 0.9 Release.</revremark>
             </revision>
             <revision>
                 <revnumber>1.0</revnumber>
                 <date>6 April 2011</date>
-                <revremark>This manual revision corresponds to the Yocto Project 1.0 Release.</revremark>
+                <revremark>Released with the Yocto Project 1.0 Release.</revremark>
             </revision>
             <revision>
                 <revnumber>1.0.1</revnumber>
                 <date>23 May 2011</date>
-                <revremark>Released with Yocto Project 1.0.1 on 23 May 2011.</revremark>
+                <revremark>Released with the Yocto Project 1.0.1 Release.</revremark>
+            </revision>
+            <revision>
+                <revnumber>1.1</revnumber>
+                <date>6 October 2011</date>
+                <revremark>Released with the Yocto Project 1.1 Release.</revremark>
             </revision>
         </revhistory>
 

documentation/bsp-guide/bsp.xml

@@ -100,8 +100,7 @@
         "
                 </literallayout>
                 For more detailed information on layers, see the 
-                <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html#usingpoky-changes-layers'>
-                BitBake Layers</ulink> section of the Yocto Project Reference Manual.
+                "<ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#usingpoky-changes-layers'>BitBake Layers</ulink>" section of the Yocto Project Reference Manual.
                 You can also see the detailed examples in the appendices of  
                 <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>
                 The Yocto Project Development Manual</ulink>.
@@ -145,6 +144,9 @@
      meta-crownbay/recipes-bsp/formfactor/formfactor/crownbay/machconfig
      meta-crownbay/recipes-bsp/formfactor/formfactor/crownbay-noemgd/
      meta-crownbay/recipes-bsp/formfactor/formfactor/crownbay-noemgd/machconfig
+     meta-crownbay/recipes-core
+     meta-crownbay/recipes-core/tasks
+     meta-crownbay/recipes-core/tasks/task-core-tools.bbappend
      meta-crownbay/recipes-graphics/
      meta-crownbay/recipes-graphics/xorg-xserver/
      meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.6.bb
@@ -371,6 +373,24 @@
             </para></note>
             </section>
 
+            <section id='bsp-filelayout-core-recipes'>
+            <title>Core Recipe Files</title>
+            <para>
+                You can find these files in the Yocto Project file's directory structure at:
+                <literallayout class='monospaced'>
+     meta-&lt;bsp_name&gt;/recipes-core/*
+                </literallayout> 
+            </para>
+
+            <para>
+                This directory contains recipe files for the core.
+                For example, in the Crown Bay BSP there is the 
+                <filename>task-core-tools.bbappend</filename> file, which is an append file used 
+                to recommend that the SystemTap package be included as a package when the image
+                is built.
+            </para>
+            </section>
+
             <section id='bsp-filelayout-recipes-graphics'>
             <title>Display Support Files</title>
             <para>

documentation/dev-manual/dev-manual-bsp-appendix.xml

@@ -26,8 +26,7 @@
         You can get files through tarball extraction or by cloning the <filename>poky</filename>
         Git repository.  
         See the bulleted item
-        <link linkend='local-yp-release'>Yocto Project Release</link> in
-        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
+        "<link linkend='local-yp-release'>Yocto Project Release</link>" 
         for information on how to get these files.
     </para>
 
@@ -40,14 +39,14 @@
      $ git branch -a
      $ git tag -l
         </literallayout> 
-        For this example we are going to use the Yocto Project 1.1 Release, 
-        which maps to the <filename>1.1</filename> branch in the repository. 
-        These commands create a local branch named <filename>1.1</filename>
+        For this example we are going to use the Yocto Project 1.1 Release, which is code
+        named "edison". 
+        These commands create a local branch named <filename>edison</filename>
         that tracks the remote branch of the same name.
         <literallayout class='monospaced'>
      $ cd poky
-     $ git checkout -b 1.1 origin/1.1
-     Switched to a new branch '1.1'
+     $ git checkout -b edison origin/edison
+     Switched to a new branch 'edison'
         </literallayout>
     </para>
 </section>
@@ -56,15 +55,15 @@
     <title>Choosing a Base BSP</title>
 
     <para>
-        For this example, the base BSP is the Intel Atom Processor E660 with Intel Platform 
+        For this example, the base BSP is the <trademark class='registered'>Intel</trademark>
+        <trademark class='trade'>Atom</trademark> Processor E660 with Intel Platform 
         Controller Hub EG20T Development Kit, which is otherwise referred to as "Crown Bay."
         The BSP layer is <filename>meta-crownbay</filename>.
     </para>
 
     <para>
         For information on how to choose a base BSP, see
-        <xref linkend='developing-a-board-support-package-bsp'>Developing a Board Support Package (BSP)</xref>
-        earlier in this manual.
+        "<link linkend='developing-a-board-support-package-bsp'>Developing a Board Support Package (BSP)</link>".
     </para>
 </section>
 
@@ -73,17 +72,17 @@
 
     <para>
         You need to have the base BSP layer on your development system.  
-        Like the local Yocto Project files, you can get the BSP 
+        Similar to the local Yocto Project files, you can get the BSP 
         layer one of two ways:  
         download the BSP tarball and extract it, or set up a local Git repository that 
         has the Yocto Project BSP layers.  
         You should use the same method that you used to get the local Yocto Project files earlier.
-        See <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
-        for information on how to get the BSP files.
+        See "<link linkend='getting-setup'>Getting Setup</link>" for information on how to get 
+        the BSP files.
     </para>
         
     <para>
-        This example assumes a local <filename>meta-intel</filename> Git repository
+        This example assumes the local <filename>meta-intel</filename> Git repository is
         inside the local <filename>poky</filename> Git repository.
         The <filename>meta-intel</filename> Git repository contains all the metadata 
         that supports BSP creation.
@@ -92,11 +91,11 @@
     <para>
         Because <filename>meta-intel</filename> is its own Git repository, you will want
         to be sure you are in the appropriate branch for your work.
-        For this example we are going to use the <filename>1.1</filename> branch. 
+        For this example we are going to use the <filename>edison</filename> branch. 
         <literallayout class='monospaced'>
      $ cd meta-intel
-     $ git checkout -b 1.1 origin/1.1
-     Switched to a new branch 'bernard'
+     $ git checkout -b edison origin/edison
+     Switched to a new branch 'edison'
         </literallayout>
     </para>
 </section>
@@ -105,14 +104,14 @@
     <title>Making a Copy of the Base BSP to Create Your New BSP Layer</title>
 
     <para>
-        Now that you have the local Yocto Project files and the base BSP files you need to create a 
+        Now that you have the local Yocto Project files and the base BSP files, you need to create a 
         new layer for your BSP.
-        To create your BSP layer you simply copy the <filename>meta-crownbay</filename>
+        To create your BSP layer, you simply copy the <filename>meta-crownbay</filename>
         layer to a new layer.
     </para>
 
     <para>  
-        For this example the new layer will be named <filename>meta-mymachine</filename>.  
+        For this example, the new layer will be named <filename>meta-mymachine</filename>.  
         The name must follow the BSP layer naming convention, which is 
         <filename>meta-&lt;name&gt;</filename>.  
         The following example assumes your working directory is <filename>meta-intel</filename> 
@@ -148,7 +147,7 @@
         </para>
 
         <para>
-            First, since in this example the new BSP will not support EMGD we will get rid of the 
+            First, since in this example the new BSP will not support EMGD, we will get rid of the 
             <filename>crownbay.conf</filename> file and then rename the 
             <filename>crownbay-noemgd.conf</filename> file to <filename>mymachine.conf</filename>.  
             Much of what we do in the configuration directory is designed to help the Yocto Project 
@@ -172,7 +171,7 @@
             Note that inside the <filename>mymachine.conf</filename> is the 
             <filename>PREFERRED_PROVIDER_virtual/kernel</filename> statement. 
             This statement identifies the kernel that the BSP is going to use.
-            In this case the BSP is using <filename>linux-yocto</filename>, which is the 
+            In this case, the BSP is using <filename>linux-yocto</filename>, which is the 
             current Linux Yocto kernel based on the Linux 3.0 release. 
         </para>
 
@@ -180,8 +179,9 @@
             The next configuration file in the new BSP layer we need to edit is <filename>layer.conf</filename>.
             This file identifies build information needed for the new layer.  
             You can see the 
-            <ulink url='http://www.yoctoproject.org/docs/1.1/bsp-guide/bsp-guide.html#bsp-filelayout-layer'>
-            Layer Configuration File</ulink> section in the Board Support Packages (BSP) Development Guide
+            "<ulink url='http://www.yoctoproject.org/docs/1.1/bsp-guide/bsp-guide.html#bsp-filelayout-layer'>Layer Configuration File</ulink>" section in  
+            <ulink url='http://www.yoctoproject.org/docs/1.1/bsp-guide/bsp-guide.html'>The Board 
+            Support Packages (BSP) Development Guide</ulink>
             for more information on this configuration file.  
             Basically, we are changing the existing statements to work with our BSP. 
         </para>
@@ -212,10 +212,10 @@
         <para>
             Now we will take a look at the recipes in your new layer.  
             The standard BSP structure has areas for BSP, graphics, core, and kernel recipes.  
-            When you create a BSP you use these areas for appropriate recipes and append files.  
+            When you create a BSP, you use these areas for appropriate recipes and append files.  
             Recipes take the form of <filename>.bb</filename> files.  
             If you want to leverage the existing recipes the Yocto Project build system uses
-            but change those recipes you can use <filename>.bbappend</filename> files.  
+            but change those recipes, you can use <filename>.bbappend</filename> files.  
             All new recipes and append files for your layer must go in the layer’s 
             <filename>recipes-bsp</filename>, <filename>recipes-kernel</filename>, 
             <filename>recipes-core</filename>, and 
@@ -310,7 +310,7 @@
                 However, in the <filename>meta-mymachine</filename> layer in 
                 <filename>recipes-kernel/linux</filename> resides a <filename>.bbappend</filename>
                 file named <filename>linux-yocto_3.0.bbappend</filename> that 
-                is appended to the recipe of the same name in <filename>meta/recipes-kernel/link</filename>.
+                is appended to the recipe of the same name in <filename>meta/recipes-kernel/linux</filename>.
                 Thus, the <filename>SRCREV</filename> statements in the "append" file override
                 the more general statements found in <filename>meta</filename>.
             </para>
@@ -321,14 +321,14 @@
                 Here are the statements: 
                 <literallayout class='monospaced'>
      SRCREV_machine_pn-linux-yocto_crownbay ?= \
-        "372c0ab135978bd8ca3a77c88816a25c5ed8f303"
+        "2247da9131ea7e46ed4766a69bb1353dba22f873"
      SRCREV_meta_pn-linux-yocto_crownbay ?= \
-        "d5d3c6480d61f83503ccef7fbcd765f7aca8b71b"
+        "67a46a608f47c19f16995be7de7b272025864b1b"
 
      SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= \
-        "372c0ab135978bd8ca3a77c88816a25c5ed8f303"
+        "2247da9131ea7e46ed4766a69bb1353dba22f873"
      SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= \
-        "d5d3c6480d61f83503ccef7fbcd765f7aca8b71b"
+        "67a46a608f47c19f16995be7de7b272025864b1b"
                 </literallayout>
             </para>
 
@@ -345,7 +345,7 @@
             <para>  
                 To fix this situation in <filename>linux-yocto_3.0.bbappend</filename>
                 we delete the two <filename>SRCREV</filename> statements that support 
-               EMGD (the top pair).
+                EMGD (the top pair).
                 We also change the remaining pair to specify <filename>mymachine</filename>
                 and insert the commit identifiers to identify the kernel in which we 
                 are interested, which will be based on the <filename>atom-pc-standard</filename>
@@ -353,9 +353,9 @@
                 Here are the final <filename>SRCREV</filename> statements:
                 <literallayout class='monospaced'>
      SRCREV_machine_pn-linux-yocto_mymachine ?= \ 
-        "fce17f046d3756045e4dfb49221d1cf60fcae329"
+        "06c798f25a19281d7fa944b14366dd75820ba009"
      SRCREV_meta_pn-linux-yocto_mymachine ?= \ 
-        "84f1a422d7e21fbc23a687035bdf9d42471f19e0"
+        "67a46a608f47c19f16995be7de7b272025864b1b"
                 </literallayout>
             </para>
 
@@ -364,9 +364,8 @@
                 exact commit strings in the Yocto Project source repositories you need to change 
                 the <filename>SRCREV</filename> statements.  
                 You can find all the <filename>machine</filename> and <filename>meta</filename> 
-                branch points (commits) for the <filename>linux-yocto-3.0</filename> kernel 
-                <ulink url='http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37'>here</ulink>
-                [WRITER's NOTE:  Need new link to the 3.0 source repo area when it is available].  
+                branch points (commits) for the <filename>linux-yocto-3.0</filename> kernel at
+                <ulink url='http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-3.0'></ulink>.  
             </para>
 
             <para>
@@ -405,9 +404,9 @@
      KERNEL_FEATURES_append_mymachine += " cfg/smp.scc"
 
      SRCREV_machine_pn-linux-yocto_mymachine ?= \
-        "fce17f046d3756045e4dfb49221d1cf60fcae329"
+        "06c798f25a19281d7fa944b14366dd75820ba009"
      SRCREV_meta_pn-linux-yocto_mymachine ?= \
-        "84f1a422d7e21fbc23a687035bdf9d42471f19e0"
+        "67a46a608f47c19f16995be7de7b272025864b1b"
                 </literallayout>
             </para>
         </section>
@@ -502,7 +501,7 @@
         For example, moving your working directory around could cause problems.  
         Here is the command for this example:
         <literallayout class='monospaced'>
-     $ bitbake –k core-image-sato-live
+     $ bitbake -k core-image-sato
         </literallayout>
     </para>
 

documentation/dev-manual/dev-manual-intro.xml

@@ -4,179 +4,178 @@
 <chapter id='dev-manual-intro'>
 
 <title>The Yocto Project Development Manual</title>
+    <section id='intro'>
+        <title>Introduction</title>
 
-<para>
-    WRITER NOTE: The goal of this manual is to provide an over-arching development guide for using the Yocto Project.  
-    The intent is to give the reader the “big picture” around development.  
-    Much of the information in the manual will be detailed in other manuals.  
-    For example, detailed information on Git, repositories and open-source in general can be found in many places.  
-    Another example is getting set up to use the Yocto Project, which our Yocto Project Quick Start covers.  
-    However, this manual needs to at least address it.  
-    One might ask “What becomes of the Poky Reference Manual?”  
-    This manual, over time, needs to develop into a pure reference manual where all procedural information 
-    eventually ends up in an appropriate guide.   
-    A good example of information perfect for the Poky Reference Manual is the appendix on variable 
-    definitions (glossary).
-</para>
+        <para>
+            Welcome to the Yocto Project Development Manual!
+            This manual gives you an idea of how to use the Yocto Project to develop embedded Linux 
+            images and user-space applications to run on targeted devices. 
+            Reading this manual gives you an overview of image, kernel, and user-space application development
+            using the Yocto Project. 
+            Because much of the information in this manual is general, it contains many references to other
+            sources where you can find more detail.
+            For example, detailed information on Git, repositories and open-source in general 
+            can be found in many places.  
+            Another example is how to get set up to use the Yocto Project, which our Yocto Project Quick Start covers.
+        </para>
 
-<section id='intro'>
-    <title>Introduction</title>
+        <para>  
+            The Yocto Project Development Manual, however, does provide detailed examples on how to create a 
+            Board Support Package (BSP), change the kernel source code, and re-configure the kernel.
+            You can find this information in the appendices of the manual.
+        </para>
+    </section>
 
-    <para>
-        Welcome to the Yocto Project Development Guide!  
-        This guide provides a general view of the development process using the Yocto Project.  
-        This guide is just that – a guide.  
-        It helps you understand the bigger picture involving development using the Yocto Project.  
-    </para>
-</section>
+    <section id='what-this-manual-provides'>
+        <title>What this Manual Provides</title>
 
-<section id='what-this-manual-provides'>
-    <title>What this Manual Provides</title>
+        <para>
+            The following list describes what you can get from this guide:
+            <itemizedlist>
+                <listitem><para>Information that lets you get set 
+                    up to develop using the Yocto Project.</para></listitem>
+                <listitem><para>Information to help developers that are new to the open source environment 
+                    and to the distributed revision control system Git, which the Yocto Project 
+                    uses.</para></listitem>
+                <listitem><para>An understanding of common end-to-end development models.</para></listitem>
+                <listitem><para>Development case overviews for both system development and user-space 
+                    applications.</para></listitem>
+                <listitem><para>An overview and understanding of the emulation environment used with 
+                    the Yocto Project (QEMU).</para></listitem>
+<!--                <listitem><para>A discussion of target-level analysis techniques, tools, tips, 
+                    and tricks.</para></listitem>
+                <listitem><para>Considerations for deploying your final product.</para></listitem> -->
+                <listitem><para>An understanding of basic kernel architecture and 
+                    concepts.</para></listitem>
+<!--                <listitem><para>Information that will help you migrate an existing project to the 
+                    Yocto Project development environment.</para></listitem> -->
+                <listitem><para>Many references to other sources of related information.</para></listitem>
+            </itemizedlist>
+        </para>
+    </section>
 
-    <para>
-        The following list describes what you can get from this guide:
-        <itemizedlist>
-            <listitem><para>Information that lets you get set 
-                up to develop using the Yocto Project.</para></listitem>
-            <listitem><para>Information to help developers that are new to the open source environment 
-                and to the distributed revision control system Git, which the Yocto Project 
-                uses.</para></listitem>
-            <listitem><para>An understanding of common end-to-end development models.</para></listitem>
-            <listitem><para>Development case overviews for both system development and user-space 
-                applications.</para></listitem>
-            <listitem><para>An overview and understanding of the emulation environment used with 
-                the Yocto Project (QEMU).</para></listitem>
-            <listitem><para>A discussion of target-level analysis techniques, tools, tips, 
-                and tricks.</para></listitem>
-            <listitem><para>Considerations for deploying your final product.</para></listitem>
-            <listitem><para>An understanding of basic kernel architecture and 
-                concepts.</para></listitem>
-            <listitem><para>Information that will help you migrate an existing project to the 
-                Yocto Project development environment.</para></listitem>
-            <listitem><para>Many references to other sources of related information.</para></listitem>
-        </itemizedlist>
-    </para>
-</section>
+    <section id='what-this-manual-does-not-provide'>
+        <title>What this Manual Does Not Provide</title>
 
-<section id='what-this-manual-does-not-provide'>
-    <title>What this Manual Does Not Provide</title>
+        <para>
+            This manual will not give you the following:
+            <itemizedlist>
+                <listitem><para>Step-by-step instructions if those instructions exist in other Yocto 
+                    Project documentation.  
+                    For example, The Application Development Toolkit (ADT) User’s Guide contains detailed 
+                    instruction on how to obtain and configure the 
+                    <trademark class='trade'>Eclipse</trademark> Yocto Plug-in.</para></listitem>
+                <listitem><para>Reference material.  
+                    This type of material resides in an appropriate reference manual.  
+                    For example, system variables are documented in the 
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
+                    Yocto Project Reference Manual</ulink>.</para></listitem>
+                <listitem><para>Detailed public information that is not specific to the Yocto Project.  
+                    For example, exhaustive information on how to use Git is covered better through the 
+                    Internet than in this manual.</para></listitem>
+            </itemizedlist>
+        </para>
+    </section>
 
-    <para>
-        This manual will not give you the following:
-        <itemizedlist>
-            <listitem><para>Step-by-step instructions if those instructions exist in other Yocto 
-                Project documentation.  
-                For example, The Application Development Toolkit (ADT) User’s Guide contains detailed 
-                instruction on how to obtain and configure the Eclipse Yocto Plug-in.</para></listitem>
-            <listitem><para>Reference material.  
-                This type of material resides in an appropriate reference manual.  
-                For example, system variables are documented in the Poky Reference Manual.</para></listitem>
-            <listitem><para>Detailed public information that is not specific to the Yocto Project.  
-                For example, exhaustive information on how to use Git is covered better through the 
-                Internet than in this manual.</para></listitem>
-        </itemizedlist>
-    </para>
-</section>
-
-<section id='other-information'>
-    <title>Other Information</title>
+    <section id='other-information'>
+        <title>Other Information</title>
  
-    <para>
-        Because this manual presents overview information for many different topics, you will
-        need to supplement it with other information.
-        The following list presents other sources of information you might find helpful:
-        <itemizedlist>
-            <listitem><para><emphasis>The <ulink url='http://www.yoctoproject.org'>Yocto Project Website</ulink>:
-                </emphasis> The home page for the Yocto Project provides lots of information on the project 
-                as well as links to software and documentation.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
-                The Yocto Project Quick Start</ulink>:</emphasis> This short document lets you get started 
-                with the Yocto Project quickly and start building an image.</para></listitem>
-            <listitem><para><emphasis> 
-                <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
-                The Yocto Project Reference Manual</ulink>:</emphasis> This manual is a reference 
-                guide to the Yocto Project build component known as "Poky."  
-                The manual also contains a reference chapter on Board Support Package (BSP) 
-                layout.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html'>
-                The Yocto Project Application Development Toolkit (ADT) User's Guide</ulink>:</emphasis>
-                This guide provides information that lets you get going with the ADT to 
-                develop projects using the Yocto Project.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://www.yoctoproject.org/docs/1.1/bsp-guide/bsp-guide.html'>
-                The Yocto Project Board Support Package (BSP) Developer's Guide</ulink>:</emphasis>
-                This guide defines the structure for BSP components.  
-                Having a commonly understood structure encourages standardization.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://www.yoctoproject.org/docs/1.1/kernel-manual/kernel-manual.html'>
-                The Yocto Project Kernel Architecture and Use Manual</ulink>:</emphasis>
-                This manual describes the architecture of the Yocto Project kernel and provides 
-                some work flow examples.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://www.youtube.com/watch?v=3ZlOu-gLsh0'>
-                Yocto Eclipse Plug-in</ulink>:</emphasis> A step-by-step instructional video that
-                demonstrates how an application developer uses Yocto Plug-in features within 
-                the Eclipse IDE.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://wiki.yoctoproject.org/wiki/FAQ'>FAQ</ulink>:</emphasis>
-                A list of commonly asked questions and their answers.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://www.yoctoproject.org/download/yocto/yocto-project-1.0-release-notes-poky-5.0'>
-                Release Notes</ulink>:</emphasis> Features, updates and known issues for the current 
-                release of the Yocto Project.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://bugzilla.yoctoproject.org/'>Bugzilla</ulink>:</emphasis>
-                The bug tracking application the Yocto Project uses.
-                If you find problems with the Yocto Project, you should report them using this
-                application.</para></listitem>
-            <listitem><para><emphasis>
-                Yocto Project Mailing Lists:</emphasis> To subscribe to the Yocto Project mailing 
-                lists, click on the following URLs and follow the instructions:
-                <itemizedlist>
-                    <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/yocto'></ulink> for a 
-                        Yocto Discussions mailing list.</para></listitem>
-                    <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/poky'></ulink> for a 
-                        Yocto Project Discussions mailing list.</para></listitem>
-                    <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/yocto-announce'></ulink>
-                        for a mailing list to receive offical Yocto Project announcements for developments and 
-                        as well as Yocto Project milestones.</para></listitem>
-                </itemizedlist></para></listitem>
-            <listitem><para><emphasis>Internet Relay Chat (IRC):</emphasis>
-                Two IRC channels on freenode are available 
-                for Yocto Project and Poky discussions: <filename>#yocto</filename> and 
-                <filename>#poky</filename>.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://www.openedhand.com/'>OpenedHand</ulink>:</emphasis>
-                The company where the Yocto Project build system Poky was first developed.
-                OpenedHand has since been acquired by Intel Corporation.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://www.intel.com/'>Intel Corporation</ulink>:</emphasis>
-                The company who acquired OpenedHand in 2008 and continues development on the 
-                Yocto Project.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://www.openembedded.org/'>OpenEmbedded</ulink>:</emphasis>
-                The upstream, generic, embedded distribution the Yocto Project build system (Poky) derives
-                from and to which it contributes.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://developer.berlios.de/projects/bitbake/'>
-                Bitbake</ulink>:</emphasis> The tool used to process Yocto Project metadata.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://bitbake.berlios.de/manual/'>
-                BitBake User Manual</ulink>:</emphasis> A comprehensive guide to the BitBake tool.
-                </para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://pimlico-project.org/'>Pimlico</ulink>:</emphasis>
-                A suite of lightweight Personal Information Management (PIM) applications designed 
-                primarily for handheld and mobile devices.</para></listitem>
-            <listitem><para><emphasis>
-                <ulink url='http://wiki.qemu.org/Index.html'>QEMU</ulink>:
-                </emphasis> An open source machine emulator and virtualizer.</para></listitem>
-        </itemizedlist>
-    </para>
-</section>
-            
+        <para>
+            Because this manual presents overview information for many different topics, you will
+            need to supplement it with other information.
+            The following list presents other sources of information you might find helpful:
+            <itemizedlist>
+                <listitem><para><emphasis>The <ulink url='http://www.yoctoproject.org'>Yocto Project Website</ulink>:
+                    </emphasis> The home page for the Yocto Project provides lots of information on the project 
+                    as well as links to software and documentation.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
+                    The Yocto Project Quick Start</ulink>:</emphasis> This short document lets you get started 
+                    with the Yocto Project quickly and start building an image.</para></listitem>
+                <listitem><para><emphasis> 
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
+                    The Yocto Project Reference Manual</ulink>:</emphasis> This manual is a reference 
+                    guide to the Yocto Project build component known as "Poky."  
+                    The manual also contains a reference chapter on Board Support Package (BSP) 
+                    layout.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html'>
+                    The Yocto Project Application Development Toolkit (ADT) User's Guide</ulink>:</emphasis>
+                    This guide provides information that lets you get going with the ADT to 
+                    develop projects using the Yocto Project.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/bsp-guide/bsp-guide.html'>
+                    The Yocto Project Board Support Package (BSP) Developer's Guide</ulink>:</emphasis>
+                    This guide defines the structure for BSP components.  
+                    Having a commonly understood structure encourages standardization.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/kernel-manual/kernel-manual.html'>
+                    The Yocto Project Kernel Architecture and Use Manual</ulink>:</emphasis>
+                    This manual describes the architecture of the Yocto Project kernel and provides 
+                    some work flow examples.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://www.youtube.com/watch?v=3ZlOu-gLsh0'>
+                    Yocto Eclipse Plug-in</ulink>:</emphasis> A step-by-step instructional video that
+                    demonstrates how an application developer uses Yocto Plug-in features within 
+                    the Eclipse IDE.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://wiki.yoctoproject.org/wiki/FAQ'>FAQ</ulink>:</emphasis>
+                    A list of commonly asked questions and their answers.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://www.yoctoproject.org/download/yocto/yocto-project-1.0-release-notes-poky-5.0'>
+                    Release Notes</ulink>:</emphasis> Features, updates and known issues for the current 
+                    release of the Yocto Project.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://bugzilla.yoctoproject.org/'>Bugzilla</ulink>:</emphasis>
+                    The bug tracking application the Yocto Project uses.
+                    If you find problems with the Yocto Project, you should report them using this
+                    application.</para></listitem>
+                <listitem><para><emphasis>
+                    Yocto Project Mailing Lists:</emphasis> To subscribe to the Yocto Project mailing 
+                    lists, click on the following URLs and follow the instructions:
+                    <itemizedlist>
+                        <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/yocto'></ulink> for a 
+                            Yocto Project Discussions mailing list.</para></listitem>
+                        <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/poky'></ulink> for a 
+                            Yocto Project Discussions mailing list about the Poky build system.</para></listitem>
+                        <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/yocto-announce'></ulink>
+                            for a mailing list to receive offical Yocto Project announcements for developments and 
+                            as well as Yocto Project milestones.</para></listitem>
+                    </itemizedlist></para></listitem>
+                <listitem><para><emphasis>Internet Relay Chat (IRC):</emphasis>
+                    Two IRC channels on freenode are available 
+                    for Yocto Project and Poky discussions: <filename>#yocto</filename> and 
+                    <filename>#poky</filename>.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://www.openedhand.com/'>OpenedHand</ulink>:</emphasis>
+                    The company where the Yocto Project build system Poky was first developed.
+                    OpenedHand has since been acquired by Intel Corporation.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://www.intel.com/'>Intel Corporation</ulink>:</emphasis>
+                    The company who acquired OpenedHand in 2008 and continues development on the 
+                    Yocto Project.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://www.openembedded.org/'>OpenEmbedded</ulink>:</emphasis>
+                    The upstream, generic, embedded distribution the Yocto Project build system (Poky) derives
+                    from and to which it contributes.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://developer.berlios.de/projects/bitbake/'>
+                    Bitbake</ulink>:</emphasis> The tool used to process Yocto Project metadata.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://bitbake.berlios.de/manual/'>
+                    BitBake User Manual</ulink>:</emphasis> A comprehensive guide to the BitBake tool.
+                    </para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://pimlico-project.org/'>Pimlico</ulink>:</emphasis>
+                    A suite of lightweight Personal Information Management (PIM) applications designed 
+                    primarily for handheld and mobile devices.</para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='http://wiki.qemu.org/Index.html'>QEMU</ulink>:
+                    </emphasis> An open-source machine emulator and virtualizer.</para></listitem>
+            </itemizedlist>
+        </para>
+    </section>   
 </chapter>
 <!--
 vim: expandtab tw=80 ts=4

documentation/dev-manual/dev-manual-kernel-appendix.xml

@@ -47,7 +47,7 @@
                     <listitem><para>The <filename>poky-extras</filename> Git repository placed 
                         within the local Yocto Project files Git repository</para></listitem>  
                     <listitem><para>A bare clone of the Linux Yocto kernel upstream Git 
-                        repository that you want to modify
+                        repository to which you want to push your modifications.
                         </para></listitem>
                     <listitem><para>A copy of that bare clone in which you make your source 
                         modifcations</para></listitem>
@@ -56,9 +56,10 @@
 
             <para> 
                 The following figure summarizes these four areas.  
-                Within each rectangular that represents a data structure an URL appears at the 
+                Within each rectangular that represents a data structure, a  
+                host development directory pathname appears at the 
                 lower left-hand corner of the box.  
-                These URLs are the locations used in this example.
+                These pathnames are the locations used in this example.
                 The figure also provides key statements and commands used during the kernel
                 modification process:
             </para>
@@ -74,13 +75,12 @@
                     <listitem><para><emphasis>Local Yocto Project Files Git Repository:</emphasis> 
                         This area contains all the metadata that supports building images in the 
                         Yocto Project build environment - the local Yocto Project files.
-                        The Local Yocto Project files Git repository also contains the build directory
+                        The local Yocto Project files Git repository also contains the build directory
                         and a configuration directory that let you control the build.
-                        Note also that in this example the repository also contains the 
+                        Note also that in this example, the repository also contains the 
                         <filename>poky-extras</filename> Git repository.</para>
                         <para>See the bulleted item
-                        <link linkend='local-yp-release'>Yocto Project Release</link> in
-                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
+                        "<link linkend='local-yp-release'>Yocto Project Release</link>"
                         for information on how to get these files.</para></listitem>
                     <listitem><para><emphasis><filename>poky-extras</filename> Git Repository:</emphasis> 
                         This area contains the <filename>meta-kernel-dev</filename> layer, 
@@ -91,9 +91,8 @@
                         (or really any) kernel recipes that faciliate the creation and development
                         of kernel features, BSPs or configurations.</para>
                         <para>See the bulleted item
-                        <link linkend='poky-extras-repo'>The 
-                        <filename>poky-extras</filename> Git Repository</link> in
-                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
+                        "<link linkend='poky-extras-repo'>The 
+                        <filename>poky-extras</filename> Git Repository</link>" 
                         for information on how to get these files.</para></listitem>                
                     <listitem><para><emphasis>Bare Clone of the Linux Yocto kernel:</emphasis> 
                         This bare Git repository tracks the upstream Git repository of the Linux 
@@ -105,8 +104,7 @@
                         <filename>poky-extras</filename> repository points to the bare clone
                         so that the build process can locate the locally changed source files.</para>
                         <para>See the bulleted item
-                        <link linkend='local-kernel-files'>Linux Yocto Kernel</link> in  
-                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
+                        "<link linkend='local-kernel-files'>Linux Yocto Kernel</link>"
                         for information on how to set up the bare clone.
                         </para></listitem>
                     <listitem><para><emphasis>Copy of the Linux Yocto Kernel Bare Clone:</emphasis>
@@ -114,9 +112,14 @@
                         Any changes you make to files in this location need to ultimately be pushed
                         to the bare clone using the <filename>git push</filename> command.</para>
                         <para>See the bulleted item
-                        <link linkend='local-kernel-files'>Linux Yocto Kernel</link> in  
-                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
+                        "<link linkend='local-kernel-files'>Linux Yocto Kernel</link>"
                         for information on how to set up the bare clone.
+                        <note>Typically, Git workflows follow a scheme where changes made to a local area 
+                        are pulled into a Git repository.
+                        However, because the <filename>git pull</filename> command does not work 
+                        with bare clones, this workflow pushes changes to the 
+                        repository even though you could use other more complicated methods to
+                        get changes into the bare clone.</note>
                         </para></listitem>
                 </itemizedlist>
             </para>
@@ -131,8 +134,7 @@
                 This example uses <filename>poky</filename> as the root directory of the 
                 local Yocto Project files Git repository.
                 See the bulleted item
-                <link linkend='local-yp-release'>Yocto Project Release</link> in
-                <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
+                "<link linkend='local-yp-release'>Yocto Project Release</link>"
                 for information on how to get these files.
             </para>
 
@@ -146,14 +148,14 @@
      $ git branch -a
      $ git tag -l
                 </literallayout> 
-                This example uses the Yocto Project 1.1_M3 Release, 
-                which maps to the <filename>1.1_M3</filename> branch in the repository. 
-                The following commands create and checkout the local <filename>1.1_M3</filename>
+                This example uses the Yocto Project 1.1 Release code named "edison", 
+                which maps to the <filename>edison</filename> branch in the repository. 
+                The following commands create and checkout the local <filename>edison</filename>
                 branch:
                 <literallayout class='monospaced'>
-     $ git checkout -b 1.1_M3 origin/1.1_M3
-     Branch 1.1_M3 set up to track remote branch 1.1_M3 from origin.
-     Switched to a new branch '1.1_M3'
+     $ git checkout -b edison origin/edison
+     Branch edison set up to track remote branch edison from origin.
+     Switched to a new branch 'edison'
                 </literallayout>
             </para>
         </section>
@@ -165,9 +167,8 @@
                 This example places the <filename>poky-extras</filename> Git repository inside
                 of <filename>poky</filename>.
                 See the bulleted item
-                <link linkend='poky-extras-repo'>The 
-                <filename>poky-extras</filename> Git Repository</link> in
-                <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
+                "<link linkend='poky-extras-repo'>The 
+                <filename>poky-extras</filename> Git Repository</link>" 
                 for information on how to get the <filename>poky-extras</filename> repository.
             </para>
         </section>
@@ -180,8 +181,7 @@
                 Thus, you need to create a bare clone of that kernel and then make a copy of the 
                 bare clone.
                 See the bulleted item
-                <link linkend='local-kernel-files'>Linux Yocto Kernel</link> in  
-                <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
+                "<link linkend='local-kernel-files'>Linux Yocto Kernel</link>" 
                 for information on how to do that.
             </para>
 
@@ -196,7 +196,8 @@
                 <literallayout class='monospaced'>
      $ cd ~/linux-yocto-3.0
      $ git checkout -b common-pc-base origin/yocto/standard/common-pc/base
-     Branch common-pc-base set up to track remote branch yocto/standard/common-pc/base from origin.
+     Branch common-pc-base set up to track remote branch 
+        yocto/standard/common-pc/base from origin.
      Switched to a new branch 'common-pc-base'
                 </literallayout>
             </para>
@@ -224,7 +225,9 @@
                     of cores your machine supports and set <filename>PARALLEL_MAKE</filename> to one and 
                     a half times the number of cores your machine supports.
                 </note>
-                The following commands build the default <filename>qemux86</filename> image:
+                The following two commands build the default <filename>qemux86</filename> image and 
+                <filename>source</filename> build environment setup script.
+                If necessary, the script creates the build directory:
                 <literallayout class='monospaced'>
      $ cd ~/poky
      $ source oe-init-build-env
@@ -242,15 +245,14 @@
          meta-ide-support
 
      You can also run generated qemu images with a command like 'runqemu qemux86'
-
-     $ bitbake -k core-image-minimal
                 </literallayout>
             </para>
 
             <para>
-                The <filename>source</filename> command sets up the build environment and, 
-                if necessary, creates the build directory.
-                The following <filename>bitbake</filename> command starts the build.
+                The following <filename>bitbake</filename> command starts the build:
+                <literallayout class='monospaced'>
+     $ bitbake -k core-image-minimal
+                </literallayout>
                 <note>Be sure to check the settings in the <filename>local.conf</filename>
                 before starting the build.</note>
             </para>
@@ -298,8 +300,7 @@
                 <literallayout class='monospaced'>
      void __cpuinit calibrate_delay(void)
      {
-	     unsigned long ticks, loopbit;
-	     int lps_precision = LPS_PREC;
+	     unsigned long lpj;
 	     static bool printed;
 
          if (preset_lpj) {
@@ -315,8 +316,7 @@
                 <literallayout class='monospaced'>
      void __cpuinit calibrate_delay(void)
      {
-	     unsigned long ticks, loopbit;
-	     int lps_precision = LPS_PREC;
+	     unsigned long lpj;
 	     static bool printed;
          printk("*************************************\n");
          printk("*                                   *\n");
@@ -374,15 +374,16 @@
                change the target architecture of the machine you are building or you move
                the bare clone, copy of the clone, or the <filename>poky-extras</filename> repository:
                <itemizedlist>
-                   <listitem><para><emphasis>Build for the Correct Target Architecture</emphasis> - The 
+                   <listitem><para><emphasis>Build for the Correct Target Architecture:</emphasis> The 
                        <filename>local.conf</filename> file in the build directory defines the build's 
                        target architecture.
                        By default, <filename>MACHINE</filename> is set to 
-                       <filename>qemux86</filename>, which specifies a 32-bit Intel Architecture 
+                       <filename>qemux86</filename>, which specifies a 32-bit 
+                       <trademark class='registered'>Intel</trademark> Architecture 
                        target machine suitable for the QEMU emulator.  
                        In this example, <filename>MACHINE</filename> is correctly configured.
                        </para></listitem>
-                   <listitem><para><emphasis>Optimize Build Time</emphasis> - Also in the 
+                   <listitem><para><emphasis>Optimize Build Time:</emphasis> Also in the 
                        <filename>local.conf</filename> file are two variables that can speed your 
                        build time if your host supports multi-core and multi-thread capabilities:
                        <filename>BB_NUMBER_THREADS</filename> and <filename>PARALLEL_MAKE</filename>.
@@ -391,7 +392,7 @@
                        cores and setting <filename>PARALLEL_MAKE</filename> to one and a half times the 
                        number of cores.</para></listitem>
                    <listitem><para><emphasis>Identify Your <filename>meta-kernel-dev</filename>
-                       Layer</emphasis> - The <filename>BBLAYERS</filename> variable in the 
+                       Layer:</emphasis> The <filename>BBLAYERS</filename> variable in the 
                        <filename>bblayers.conf</filename> file found in the 
                        <filename>poky/build/conf</filename> directory needs to have the path to your local
                        <filename>meta-kernel-dev</filename> layer.  
@@ -408,7 +409,7 @@
        /home/scottrif/poky/poky-extras/meta-kernel-dev \
        "
                        </literallayout></para></listitem>
-                   <listitem><para><emphasis>Identify Your Source Files</emphasis> - In the 
+                   <listitem><para><emphasis>Identify Your Source Files:</emphasis> In the 
                        <filename>linux-yocto_3.0.bbappend</filename> file located in the 
                        <filename>poky-extras/meta-kernel-dev/recipes-kernel/linux</filename>
                        directory, you need to identify the location of the 
@@ -421,7 +422,7 @@
                        <literallayout class='monospaced'>
      KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0.git
                        </literallayout></para></listitem>
-                   <listitem><para><emphasis>Specify the Kernel Machine</emphasis> - Also in the 
+                   <listitem><para><emphasis>Specify the Kernel Machine:</emphasis> Also in the 
                        <filename>linux-yocto_3.0.bbappend</filename> file, you need to specify
                        the kernel machine with the following statement:
                        <literallayout class='monospaced'>
@@ -451,14 +452,15 @@
                 <orderedlist>
                     <listitem><para>Your environment should be set up since you previously sourced
                         the <filename>oe-init-build-env</filename> script.
-                        If it isn't, source the script again from <filename>poky</filename>
+                        If it isn't, source the script again from <filename>poky</filename>.
                         </para></listitem>
                     <listitem><para>Be sure old images are cleaned out by running the 
                         <filename>cleanall</filename> BitBake task as follows:
                         <literallayout class='monospaced'>
+     $ cd ~/poky
      $ bitbake -c cleanall linux-yocto
                         </literallayout></para>
-                        <para><note>Never remove by hand any files from the <filename>tmp/deploy</filename>
+                        <para><note>Never remove any files by hand from the <filename>tmp/deploy</filename>
                         directory insided the local Yocto Project files build directory.
                         Always use the BitBake <filename>cleanall</filename> task to clear
                         out previous builds.</note></para></listitem>
@@ -466,14 +468,12 @@
                         <literallayout class='monospaced'>
      $ bitbake -k core-image-minimal
                         </literallayout></para></listitem>
-                </orderedlist>
-            </para>
-
-            <para>
-                Finally, boot the modified image in the QEMU emulator using this command:
-                <literallayout class='monospaced'>
+                    <listitem><para>Finally, boot the modified image in the QEMU emulator 
+                        using this command:
+                        <literallayout class='monospaced'>
      $ runqemu qemux86
-                </literallayout>
+                        </literallayout></para></listitem>
+                </orderedlist>
             </para>
 
             <para>
@@ -495,8 +495,8 @@
         <title>Changing the Kernel Configuration</title>
 
         <para>
-            This example changes the default behavior (off) of the Symmetric Multi-processing Support 
-            (<filename>CONFIG_SMP</filename>) to on.  
+            This example changes the default behavior, which is "off", of the Symmetric 
+            Multi-processing Support (<filename>CONFIG_SMP</filename>) to "on".  
             It is a simple example that demonstrates how to reconfigure the kernel.
         </para>
 
@@ -505,34 +505,49 @@
 
             <para>
                 If you took the time to work through the example that modifies the kernel source code 
-                in <xref linkend='modifying-the-kernel-source-code'>Modifying the Kernel Source
-                Code</xref> you are set up to quickly work through this example.
+                in "<link linkend='modifying-the-kernel-source-code'>Modifying the Kernel Source
+                Code</link>" you should already have the Yocto Project files set up on your 
+                host machine.
+            </para>
+
+            <para>
+                If you don't have the Yocto Project files established on your system, 
+                See "<link linkend='setting-up-the-local-yocto-project-files-git-repository'>Setting 
+                Up the Local Yocto Project Files Git Repository</link>" for 
+                information.
+                To reconfigure the kernel, this is the only Git repository you need to have set up. 
+            </para>
+
+<!--
+
+            <para>
+                If you took the time to work through the example that modifies the kernel source code 
+                in "<link linkend='modifying-the-kernel-source-code'>Modifying the Kernel Source
+                Code</link>" you are already set up to quickly work through this example.
                 If not, then work through the following list to prepare:
                 <itemizedlist>
                     <listitem><para><emphasis>Understand the development environment:</emphasis>
-                        See <xref linkend='understanding-the-files-you-need'> 
-                        Understanding the Files You Need</xref> for information.</para></listitem>
+                        See "<link linkend='understanding-the-files-you-need'>Understanding 
+                        the Files You Need</link>" for information.</para></listitem>
                     <listitem><para><emphasis>Set up the local Yocto Project files Git 
                         repository:</emphasis>
-                        See <xref linkend='setting-up-the-local-yocto-project-files-git-repository'>
-                        Setting Up the Local Yocto Project Files Git Repository</xref> for 
+                        See "<link linkend='setting-up-the-local-yocto-project-files-git-repository'>Setting 
+                        Up the Local Yocto Project Files Git Repository</link>" for 
                         information.</para></listitem>
                     <listitem><para><emphasis>Set up the <filename>poky-extras</filename> Git 
                         repository:</emphasis>
-                        See <xref linkend='setting-up-the-poky-extras-git-repository'>
-                        Setting Up <filename>poky-extras</filename> Git repository</xref> for
+                        See "<link linkend='setting-up-the-poky-extras-git-repository'>Setting 
+                        Up <filename>poky-extras</filename> Git repository</link>" for
                         information.</para></listitem>
                     <listitem><para><emphasis>Set up the the bare clone and its copy:</emphasis>
-                        See <xref linkend='setting-up-the-bare-clone-and-its-copy'>
-                        Setting Up the Bare Clone and its Copy</xref> for information.
-                        </para></listitem>
+                        See "<link linkend='setting-up-the-bare-clone-and-its-copy'>Setting Up the 
+                        Bare Clone and its Copy</link>" for information.</para></listitem>
                     <listitem><para><emphasis>Build the default QEMU kernel image:</emphasis>
-                        See <xref linkend='building-and-booting-the-default-qemu-kernel-image'>
-                        Building and Booting the Default QEMU Kernel image</xref> 
-                        for information.
+                        See "<link linkend='building-and-booting-the-default-qemu-kernel-image'>Building 
+                        and Booting the Default QEMU Kernel image</link>" for information.
                         Do not boot the image in the QEMU emulator at this point.</para></listitem>
                 </itemizedlist>
-            </para>
+            </para> -->
         </section>
 
         <section id='examining-the-default-config-smp-behavior'>
@@ -540,10 +555,10 @@
 
             <para>
                 By default, <filename>CONFIG_SMP</filename> supports single processor machines.
-                To see this default setting from within the QEMU emulator boot your image using 
+                To see this default setting from within the QEMU emulator, boot your image using 
                 the emulator as follows:
                 <literallayout class='monospaced'>
-     $ runqemu qemux86
+     $ runqemu qemux86 qemuparams="-smp 2"
                 </literallayout>
             </para>
 
@@ -557,6 +572,8 @@
      processor       : 0
      #
                 </literallayout>
+                Logout of the emulator using the <filename>exit</filename> command and 
+                then close it down.
             </para>
         </section>
 
@@ -566,7 +583,7 @@
             <para>
                 The <filename>menuconfig</filename> tool provides an interactive method with which
                 to set kernel configurations.
-                You need to run <filename>menuconfig</filename> inside the BitBake environment.
+                You need to run <filename>menuconfig</filename> inside the Yocto BitBake environment.
                 Thus, the environment must be set up using the <filename>oe-init-build-env</filename>
                 script found in the Yocto Project files Git repository build directory.
                 If you have not sourced this script do so with the following commands:
@@ -579,7 +596,7 @@
             <para>
                 After setting up the environment to run <filename>menuconfig</filename>, you are ready 
                 to use the tool to interactively change the kernel configuration.
-                In this example we are basing our changes on the <filename>linux-yocto-3.0</filename>
+                In this example, we are basing our changes on the <filename>linux-yocto-3.0</filename>
                 kernel.
                 The Yocto Project build environment recognizes this kernel as 
                 <filename>linux-yocto</filename>.
@@ -596,23 +613,29 @@
                 You can find it at <filename>Processor Type and Features</filename>.
                 The configuration selection is 
                 <filename>Symmetric Multi-processing Support</filename>.
+                After using the arrow keys to highlight this selection, press "y" to select it.
+                Then, exit out and save your selections.
             </para>
 
             <para>
-                Once you save the selection the <filename>.config</filename> configuration file
+                Once you save the selection, the <filename>.config</filename> configuration file
                 is updated. 
                 This is the file that the build system uses to configure the Linux Yocto kernel
                 when it is built. 
                 You can find and examine this file in the Yocto Project files Git repository in 
                 the build directory. 
-                This example uses the following:
+                This example uses the following.
+                Note that this example directory is artificially split and many of the characters 
+                in the actually filename are omitted in order to make it more
+                readable:
                 <literallayout class='monospaced'>
-     ~/poky/build/tmp/work/qemux86-poky-linux/linux-yocto-2.6.37+git1+84f...r20/linux-qemux86-standard-build
+     ~/poky/build/tmp/work/qemux86-poky-linux/linux-yocto-2.6.37+git1+84f...
+        ...r20/linux-qemux86-standard-build
                 </literallayout>
             </para>
 
             <para>
-                Within the <filename>.config</filename> you can see the following setting:
+                Within the <filename>.config</filename> file, you can see the following setting:
                 <literallayout class='monospaced'>
      CONFIG_SMP=y
                 </literallayout>
@@ -621,13 +644,19 @@
             <para>
                 A good method to isolate changed configurations is to use a combination of the 
                 <filename>menuconfig</filename> tool and simple shell commands.
-                Before changing configurations with <filename>menuconfig</filename> simply rename
-                the default <filename>.config</filename>, use <filename>menuconfig</filename> to make 
+                Before changing configurations with <filename>menuconfig</filename>, copy the 
+                existing <filename>.config</filename> and rename it to something else,
+                use <filename>menuconfig</filename> to make 
                 as many changes an you want and save them, then compare the renamed configuration 
                 file against the newly created file.
                 You can use the resulting differences as your base to create configuration fragments
                 to permanently save in your kernel layer.
-                For an example of this procedure, see [WRITER'S NOTE: need forwarding link to section].
+                <note>
+                    Be sure to make a copy of the <filename>.config</filename> and don't just
+                    rename it. 
+                    The Yocto Project build system needs an existing <filename>.config</filename>
+                    from which to work.
+                </note>
             </para>
         </section>
 
@@ -635,7 +664,7 @@
             <title>Recompiling the Kernel and Testing the New Configuration</title>
 
             <para>
-                At this point you are ready to recompile your kernel image with 
+                At this point, you are ready to recompile your kernel image with 
                 the new setting in effect using the BitBake commands below:
                 <literallayout class='monospaced'>
      $ bitbake linux-yocto -c compile -f
@@ -646,7 +675,7 @@
             <para>
                 Now run the QEMU emulator:
                 <literallayout class='monospaced'>
-     $ runqemu qemux86
+     $ runqemu qemux86 qemuparams="-smp 2"
                 </literallayout>
             </para>
 
@@ -662,7 +691,7 @@
             </para>
 
             <para>
-                From the output you can see that you have successfully reconfigured the kernel.
+                From the output, you can see that you have successfully reconfigured the kernel.
             </para>
         </section>
     </section>
@@ -671,13 +700,14 @@
         <title>Adding Kernel Recipes</title>
 
         <para>
-            This section presents an example that adds kernel recipes, which provide 
+            A future release of this manual will present an example that adds kernel recipes, which provide 
             new functionality to the kernel.
         </para>
 
         <para>
-            [Example to be supplied]
-        </para>
+            <imagedata fileref="figures/wip.png" 
+                width="2in" depth="3in" align="center" scalefit="1" />
+        </para> 
     </section> 
 
 

documentation/dev-manual/dev-manual-model.xml

@@ -9,16 +9,23 @@
     Many development models exist for which you can use the Yocto Project. 
     However, for the purposes of this manual we are going to focus on two common ones:  
     System Development and User Application Development.  
-    System Development covers Board Support Package (BSP) development and kernel modification.  
+    System Development covers Board Support Package (BSP) development and kernel modification
+    or configuration.  
     User Application Development covers development of applications that you intend to run on some 
     target hardware.  
 </para>
 
 <para>
     This chapter presents overviews of both system and application models.
-    If you want to reference specific examples of these development models, 
-    see <xref linkend='dev-manual-bsp-appendix'>BSP Development Example</xref> and 
-    <xref linkend='dev-manual-kernel-appendix'>Kernel Modification Example</xref>.
+    If you want to examine specific examples of the system development models, 
+    see the "<link linkend='dev-manual-bsp-appendix'>BSP Development Example</link>" 
+    appendix and the 
+    "<link linkend='dev-manual-kernel-appendix'>Kernel Modification Example</link>" appendix.
+    For a user-space application development example that uses the 
+    <trademark class='trade'>Eclipse</trademark> IDE,
+    see the 
+    <ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html'>
+    The Yocto Project Application Development Toolkit (ADT) User's Guide</ulink>.
 </para>
 
 <section id='system-development-model'>
@@ -27,7 +34,7 @@
     <para>
         System development involves modification or creation of an image that you want to run on 
         a specific hardware target.  
-        Usually when you want to create an image that runs on embedded hardware the image does 
+        Usually, when you want to create an image that runs on embedded hardware, the image does 
         not require the same amount of features that a full-fledged Linux distribution provides.  
         Thus, you can create a much smaller image that is designed to just use the hardware 
         features for your particular hardware.
@@ -35,33 +42,33 @@
 
     <para>
         To help you understand how system development works in the Yocto Project, this section 
-        covers two types of image development:  BSP creation and kernel modification
-        (see <xref linkend='kernel-spot'></xref>).
+        covers two types of image development:  BSP creation and kernel modification or 
+        configuration.
     </para>
 
     <section id='developing-a-board-support-package-bsp'>
         <title>Developing a Board Support Package (BSP)</title>
 
         <para>
-            A BSP is a package of recipes that when applied during a build results in 
+            A BSP is a package of recipes that, when applied, during a build results in 
             an image you can run on a particular board.  
             Thus, the package, when compiled into the new image, supports the operation of the board.  
         </para>
 
         <note>
             For a brief list of terms used when describing the development process in the Yocto Project, 
-            see <xref linkend='yocto-project-terms'>Yocto Project Terms</xref> in this manual.
+            see the "<link linkend='yocto-project-terms'>Yocto Project Terms</link>" section.
         </note>
 
         <para>
             The remainder of this section presents the basic steps to create a BSP basing it on an 
             existing BSP that ships with the Yocto Project.
-            You can reference <xref linkend='dev-manual-bsp-appendix'>BSP Development Example</xref>
-            for a detailed example that uses the Crown Bay BSP as a base BSP from which to start.
+            You can reference the "<link linkend='dev-manual-bsp-appendix'>BSP Development Example</link>"
+            appendix for a detailed example that uses the Crown Bay BSP as a base BSP from which to start.
         </para>
 
         <para>
-            This illustration and the following list summarizes the BSP creation general workflow.
+            The following illustration and list summarize the BSP creation general workflow.
         </para>
 
         <para>
@@ -71,37 +78,38 @@
         <para>
             <orderedlist>
                 <listitem><para><emphasis>Set up your host development system to support 
-                    development using the Yocto Project</emphasis>:  See  
-                    <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#the-linux-distro'>
-                    The Linux Distributions</ulink> section and  
-                    <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#packages'>
-                    The Packages</ulink> section both
+                    development using the Yocto Project</emphasis>:  See the
+                    "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#the-linux-distro'>The Linux Distributions</ulink>" and the 
+                    "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#packages'>The Packages</ulink>" sections both
                     in the Yocto Project Quick Start for requirements.</para></listitem>
                 <listitem><para><emphasis>Establish a local copy of the Yocto Project files on your 
                     system</emphasis>:  You need to have the Yocto Project files available on your host system. 
                     Having the Yocto Project files on your system gives you access to the build
                     process and tools you need.
                     For information on how to get these files, see the
-                    <xref linkend='getting-setup'>Getting Setup</xref> section in this manual.</para></listitem>
+                    "<link linkend='getting-setup'>Getting Setup</link>" section.</para></listitem>
                 <listitem><para><emphasis>Establish a local copy of the base BSP files</emphasis>:  Having    
                     the BSP files on your system gives you access to the build
-                    process and tools you need.
-                    For information on how to get these files, see 
-                    <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual.</para></listitem>    
+                    process and tools you need for creating a BSP.
+                    For information on how to get these files, see the
+                    "<link linkend='getting-setup'>Getting Setup</link>" section.</para></listitem>    
                 <listitem><para><emphasis>Choose a Yocto Project-supported BSP as your base BSP</emphasis>:  
                     The Yocto Project ships with several BSPs that support various hardware.  
                     It is best to base your new BSP on an existing BSP rather than create all the 
                     recipes and configuration files from scratch.  
                     While it is possible to create everything from scratch, basing your new BSP 
                     on something that is close is much easier.  
-                    Or, at a minimum, it gives you some structure with which to start.</para>
+                    Or, at a minimum, leveraging off an existing BSP
+                    gives you some structure with which to start.</para>
                     <para>At this point you need to understand your target hardware well enough to determine which 
                     existing BSP it most closely matches.  
-                    Things to consider are your hardware’s on-board features such as CPU type and graphics support.  
+                    Things to consider are your hardware’s on-board features, such as CPU type and graphics support.  
                     You should look at the README files for supported BSPs to get an idea of which one 
                     you could use.  
-                    A generic Atom-based BSP to consider is the Crown Bay that does not support
-                    the Intel® Embedded Media Graphics Driver (EMGD).  
+                    A generic <trademark class='registered'>Intel</trademark> 
+                    <trademark class='trade'>Atom</trademark>-based BSP to consider is the 
+                    Crown Bay that does not support the <trademark class='registered'>Intel</trademark> 
+                    Embedded Media Graphics Driver (EMGD).  
                     The remainder of this example uses that base BSP.</para>
                     <para>To see the supported BSPs, go to the Yocto Project
                     <ulink url='http://www.yoctoproject.org/download'>download page</ulink> and click 
@@ -110,35 +118,34 @@
                     isolating and storing work for a given piece of hardware.  
                     A layer is really just a location or area in which you place the recipes for your BSP.  
                     In fact, a BSP is, in itself, a special type of layer.   
-                    Consider an application as another example that illustrates a layer.  
+                    Another example that illustrates a layer is an application.  
                     Suppose you are creating an application that has library or other dependencies in 
                     order for it to compile and run.  
                     The layer, in this case, would be where all the recipes that define those dependencies 
-                    are kept.  The key point for a layer is that it is an isolated area that contains 
+                    are kept.  
+                    The key point for a layer is that it is an isolated area that contains 
                     all the relevant information for the project that the Yocto Project build 
                     system knows about.</para>
                     <note>The Yocto Project supports four BSPs that are part of the 
                     Yocto Project release: <filename>atom-pc</filename>, <filename>beagleboard</filename>,
                     <filename>mpc8315e</filename>, and <filename>routerstationpro</filename>.  
                     The recipes and configurations for these four BSPs are located and dispersed 
-                    within local Yocto Project files.
+                    within the local Yocto Project files.
                     Consequently, they are not totally isolated in the spirit of layers unless you think 
                     of <filename>meta-yocto</filename> as a layer itself.  
                     On the other hand, BSP layers for Crown Bay, Emenlow, Jasper Forest, 
                     N450, and Sugar Bay are isolated.</note>
-                    <para>When you set up a layer for a new BSP you should follow a standard layout.  
-                    This layout is described in the
-                    <ulink url='http://www.yoctoproject.org/docs/1.1/bsp-guide/bsp-guide.html#bsp-filelayout'>
-                    Example Filesystem Layout</ulink> section of the Board Support Package (BSP) Development
-                    Guide.  
-                    In the standard layout you will notice a suggested structure for recipes and  
+                    <para>When you set up a layer for a new BSP, you should follow a standard layout.  
+                    This layout is described in the section
+                    "<ulink url='http://www.yoctoproject.org/docs/1.1/bsp-guide/bsp-guide.html#bsp-filelayout'>Example Filesystem Layout</ulink>" section of the Board Support Package (BSP) Development Guide.  
+                    In the standard layout, you will notice a suggested structure for recipes and  
                     configuration information.  
                     You can see the standard layout for the Crown Bay BSP in this example by examining the 
                     directory structure of the <filename>meta-crownbay</filename> layer inside the 
                     local Yocto Project files.</para></listitem>
                 <listitem><para><emphasis>Make configuration changes to your new BSP 
                     layer</emphasis>:  The standard BSP layer structure organizes the files you need to edit in 
-                    <filename>conf</filename> and several <filename>recipes-*</filename> within the 
+                    <filename>conf</filename> and several <filename>recipes-*</filename> directories within the 
                     BSP layer.
                     Configuration changes identify where your new layer is on the local system
                     and identify which kernel you are going to use.
@@ -148,22 +155,20 @@
                     recipes you don't use, and adding new recipes that you need to support your hardware.
                     </para></listitem>
                 <listitem><para><emphasis>Prepare for the build</emphasis>:  Once you have made all the 
-                    changes to your BSP layer there remains a few things 
+                    changes to your BSP layer, there remains a few things 
                     you need to do for the Yocto Project build system in order for it to create your image.  
                     You need to get the build environment ready by sourcing an environment setup script 
                     and you need to be sure two key configuration files are configured appropriately.</para>
-                    <para>The entire process for building an image is overviewed in the 
-                    <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'>
-                    Building an Image</ulink> section of the Yocto Project Quick Start.    
+                    <para>The entire process for building an image is overviewed in the section
+                    "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'>Building an Image</ulink>" section of the Yocto Project Quick Start.    
                     You might want to reference this information.</para></listitem>
                 <listitem><para><emphasis>Build the image</emphasis>:  The Yocto Project uses the BitBake 
                     tool to build images based on the type of image you want to create.  
                     You can find more information on BitBake 
                     <ulink url='http://bitbake.berlios.de/manual/'>here</ulink>.</para>
                     <para>The build process supports several types of images to satisfy different needs.  
-                    See 
-                    <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>
-                    Reference: Images</ulink> in the 
+                    See the 
+                    "<ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>Reference: Images</ulink>" appendix in the 
                     <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
                     Yocto Project Reference Manual</ulink>for information on supported images.</para></listitem>
             </orderedlist>
@@ -175,9 +180,9 @@
             You can also find supplemental information in  
             <ulink url='http://yoctoproject.org/docs/1.1/bsp-guide/bsp-guide.html'>
             The Board Support Package (BSP) Development Guide</ulink>.
-            Finally, there is wiki page write up of the example located 
+            Finally, there is wiki page write up of the example also located 
             <ulink url='https://wiki.yoctoproject.org/wiki/Transcript:_creating_one_generic_Atom_BSP_from_another'>
-            here</ulink> you might find helpful.
+            here</ulink> that you might find helpful.
        </para>
     </section>
 
@@ -198,7 +203,8 @@
             For a complete discussion of the kernel, see  
             <ulink url='http://www.yoctoproject.org/docs/1.1/kernel-manual/kernel-manual.html'>
             The Yocto Project Kernel Architecture and Use Manual</ulink>.
-            You can reference <xref linkend='dev-manual-kernel-appendix'>Kernel Modification Example</xref>
+            You can reference the appendix 
+            "<link linkend='dev-manual-kernel-appendix'>Kernel Modification Example</link>"
             for a detailed example that changes the configuration of a kernel.
         </para>
 
@@ -210,6 +216,7 @@
                 of files that contain kernel patches.
                 The Yocto Project, however, employs mechanisims, that in a sense, result in a kernel source
                 generator.
+                By the end of this section, this analogy will become clearer.
             </para>
 
             <para>
@@ -358,24 +365,22 @@
             </para>
 
             <para>
-                <imagedata fileref="figures/kernel-dev-flow.png" width="6in" depth="7in" align="center" scalefit="1" />
+                <imagedata fileref="figures/kernel-dev-flow.png" 
+                    width="6in" depth="7.5in" align="center" scalefit="1" />
             </para> 
 
             <para>
                 <orderedlist>
                     <listitem><para><emphasis>Set up your host development system to support 
                         development using the Yocto Project</emphasis>:  See  
-                        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#the-linux-distro'>
-                        The Linux Distributions</ulink> section and  
-                        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#packages'>
-                        The Packages</ulink> section both
+                        "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#the-linux-distro'>The Linux Distributions</ulink>" and  
+                        "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#packages'>The Packages</ulink>" sections both
                         in the Yocto Project Quick Start for requirements.</para></listitem>
                     <listitem><para><emphasis>Establish a local copy of the Yocto Project files on your 
                         system</emphasis>:  Having the Yocto Project files on your system gives you access to 
                         the build process and tools you need.
                         For information on how to get these files, see the bulleted item
-                        <link linkend='local-yp-release'>Yocto Project Release</link> in  
-                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual.
+                        "<link linkend='local-yp-release'>Yocto Project Release</link>" earlier in this manual.
                         </para></listitem>
                     <listitem><para><emphasis>Set up the <filename>poky-extras</filename> Git 
                         repository</emphasis>:  This repository is the area for your configuration 
@@ -384,85 +389,87 @@
                         It is good practice to set this repository up inside the local Yocto
                         Project files Git repository.
                         For information on how to get these files, see the bulleted item
-                        <link linkend='poky-extras-repo'>The 
-                        <filename>poky-extras</filename> Git Repository</link> in
-                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual.
-                        </para></listitem>
+                        "<link linkend='poky-extras-repo'>The <filename>poky-extras</filename> Git Repository</link>"
+                        earlier in this manual.</para></listitem>
                     <listitem><para><emphasis>Establish a local copy of the Linux Yocto kernel files on your 
                         system</emphasis>:  In order to make modifications to the kernel you need two things:
-                        a bare clone of the Linux Yocto kernel you are modifying and a copy of that 
-                        bare clone. 
+                        a bare clone of the Linux Yocto kernel you are modifying and  
+                        a copy of that bare clone. 
                         The bare clone is required by the build process and is the area to which you 
-                        push your kernel source changes. 
+                        push your kernel source changes (pulling does not work with bare clones). 
                         The copy of the bare clone is a local Git repository that contains all the kernel's 
                         source files. 
                         You make your changes to the files in this copy of the bare clone.
                         For information on how to set these two items up, see the bulleted item
-                        <link linkend='local-kernel-files'>Linux Yocto Kernel</link> in  
-                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual.
-                        </para></listitem>
+                        "<link linkend='local-kernel-files'>Linux Yocto Kernel</link>" 
+                        earlier in this manual.</para></listitem>
                     <listitem><para><emphasis>Make changes to the kernel source code if 
                         applicable</emphasis>:  Modifying the kernel does not always mean directly
                         changing source files. 
-                        However, if you have to do this then you make the changes in the local 
+                        However, if you have to do this, you make the changes in the local 
                         Git repository you set up to hold the source files (i.e. the copy of the 
                         bare clone).
-                        Once the changes are made you need to use Git commands to commit the changes
+                        Once the changes are made, you need to use Git commands to commit the changes
                         and then push them to the bare clone.</para></listitem>                      
                     <listitem><para><emphasis>Make kernel configuration changes
                         to your local kernel layer if applicable</emphasis>:  
-                        If your situation calls for changing the kernel's configuration you can 
+                        If your situation calls for changing the kernel's configuration, you can 
                         use <filename>menuconfig</filename>
                         to enable and disable kernel configurations.  
-                        Using <filename>menuconfig</filename> allows you to develop and test the 
-                        configuration changes you are making to the kernel.</para></listitem>                      
+                        Using <filename>menuconfig</filename> allows you to interactively develop and test the 
+                        configuration changes you are making to the kernel.
+                        When saved, changes using <filename>menuconfig</filename> update the kernel's
+                        <filename>.config</filename>.
+                        As an alternative method to changing the kernel's configuration, you can simply
+                        edit the <filename>.config</filename> found in the Yocto Project build 
+                        directory at <filename>tmp/sysroots/&lt;machine-name&gt;/kernel</filename> 
+                        directly.</para></listitem>                      
                     <listitem><para><emphasis>Add new kernel recipes if applicable</emphasis>:  The standard 
                         layer structure organizes recipe files inside the 
                         <filename>meta-kernel-dev</filename> layer that is within the 
                         <filename>poky-extras</filename> Git repository.
-                        If you need to add new kernel recipes you add them within this layer. 
-                        Also within this area you will find the <filename>.bbappend</filename> 
+                        If you need to add new kernel recipes, you add them within this layer. 
+                        Also within this area, you will find the <filename>.bbappend</filename> 
                         file that appends information to the kernel's recipe file used during the 
                         build.
                         </para></listitem>
                     <listitem><para><emphasis>Prepare for the build</emphasis>:  Once you have made all the 
                         changes to your kernel (configurations, source code changes, recipe additions, 
-                        or recipe changes) there remains a few things 
-                        you need to do for the Yocto Project build system in order for it to create your image.  
-                        If you have not done so you need to get the build environment ready by sourcing 
+                        or recipe changes), there remains a few things 
+                        you need to do in order for the Yocto Project build system to create your image.  
+                        If you have not done so, you need to get the build environment ready by sourcing 
                         the environment setup script described earlier.
                         You also need to be sure two key configuration files 
                         (<filename>local.conf</filename> and <filename>bblayers.conf</filename>)
                         are configured appropriately.</para>
                         <para>The entire process for building an image is overviewed in the 
-                        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'>
-                        Building an Image</ulink> section of the Yocto Project Quick Start.    
+                        "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'>Building an Image</ulink>" section of the Yocto Project Quick Start.    
                         You might want to reference this information.
                         Also, you should look at the detailed examples found in the appendices at 
-                        end of this manual.</para></listitem>
-                    <listitem><para><emphasis>Build the image</emphasis>:  The Yocto Project uses the BitBake 
+                        at the end of this manual.</para></listitem>
+                    <listitem><para><emphasis>Build the image</emphasis>:  The Yocto Project 
+                        build system Poky uses the BitBake 
                         tool to build images based on the type of image you want to create.  
                         You can find more information on BitBake 
                         <ulink url='http://bitbake.berlios.de/manual/'>here</ulink>.</para>
                         <para>The build process supports several types of images to satisfy different needs.  
-                        See 
-                        <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>
-                        Reference: Images</ulink> in the 
+                        See the appendix
+                        "<ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>Reference: Images</ulink>" in the 
                         <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
                         Yocto Project Reference Manual</ulink> for information on supported 
                         images.</para></listitem>
                     <listitem><para><emphasis>Make your configuration changes available
-                        in the kernel layer</emphasis>:  Up to this point all the configuration changes to the 
+                        in the kernel layer</emphasis>:  Up to this point, all the configuration changes to the 
                         kernel have been done and tested iteratively.  
-                        Once they are tested and ready to go you can move them into the kernel layer, 
-                        which allows you to distribute the layer.
-                        [WRITER'S NOTE:  Not sure if the layer is meta-kernel-dev or if it would be 
-                        a new layer copied from the work done there.]</para></listitem>
-                    <listitem><para><emphasis>Push your configuration and recipe changes upstream to the 
-                        linux Yocto Git repository (in-tree changes)</emphasis>:  If the changes you made
-                        are suited for all Linux Yocto users you might want to push the changes up into 
-                        the Linux Yocto Git repository so that they become part of the kernel tree
-                        and available to everyone using the kernel.</para></listitem> 
+                        Once they are tested and ready to go, you can move them into the kernel layer, 
+                        which allows you to distribute the layer.</para></listitem>
+                    <listitem><para><emphasis>If applicable, share your in-tree changes</emphasis>:  
+                        If the changes you made
+                        are suited for all Linux Yocto users, you might want to push the changes to a 
+                        contribution area for the Linux Yocto Git repository. 
+                        Once the changes are pushed, you can request that they 
+                        be pulled into the master branch of the kernel tree. 
+                        Doing so makes them available to everyone using the kernel.</para></listitem> 
                 </orderedlist>
             </para>
         </section>
@@ -470,11 +477,194 @@
 </section>
 
 <section id='place-holder-section-two'>
-    <title>Place-Holder Section For Application Development</title>
+    <title>Application Development Workflow</title>
 
     <para>
-        Text needed here.
+        Application development involves creation of an application that you want to be able
+        to run on your target hardware, which is running a Linux Yocto image.
+        The Yocto Project provides an Application Development Toolkit (ADT) that 
+        facilitates quick development and integration of your application into its run-time environment. 
+        Using the ADT you can employ cross-development toolchains designed for your target hardware
+        to compile and link your application. 
+        You can then deploy your application to the actual hardware or to the QEMU emulator for testing.
+        If you are familiar with the popular Eclipse IDE, you can use an Eclipse Yocto Plug-in to 
+        allow you to develop, deploy, and test your application all from within Eclipse.
     </para>
+
+    <para>
+        While we strongly suggest using the Yocto Project ADT to develop your application, you might
+        not want to.  
+        If this is the case, you can still use pieces of the Yocto Project for your development process. 
+        However, because the process can vary greatly, this manual does not provide detail on the process.
+    </para>
+
+    <section id='workflow-using-the-adt-and-eclipse'>
+        <title>Workflow Using the ADT and <trademark class='trade'>Eclipse</trademark></title>
+
+        <para>
+            To help you understand how application development works in the Yocto Project ADT
+            environment, this section 
+            provides an overview of the general development process.
+            If you want to see a detailed example of the process as it is used from within the Eclipse 
+            IDE, see 
+            <ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html'>
+            The Application Development Toolkit (ADT) User's Manual</ulink>.
+        </para>
+
+        <para>
+            This illustration and the following list summarizes the application development general workflow.
+        </para>
+
+        <para>
+            <imagedata fileref="figures/app-dev-flow.png" 
+                width="7in" depth="8in" align="center" scale="100" />
+        </para> 
+
+        <para>
+            <orderedlist>
+                <listitem><para><emphasis>Prepare the Host System for the Yocto Project</emphasis>:  
+                    See  
+                    "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#the-linux-distro'>The Linux Distributions</ulink>" and  
+                    "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#packages'>The Packages</ulink>" sections both
+                    in the Yocto Project Quick Start for requirements.</para></listitem>
+
+<!--
+WRITER NOTE:  The areas to get the kernel and root filesystem are located in the Index of 
+              downloads.  There are many forms of each.  The files that have "rootfs" are just the 
+              target root filesystems.  The file that is very small and starts with bzImage is just
+              the kernel image isolated so that it can be written to a special on-board area of 
+              flash memory.  Some systems require this.  In the machines directory there are  
+              files that combine the kernel image and the root filesystem.  These files are the ISO 
+              and HDDIMG files.  ISO images are designed to be deployed on a DVD or CD.  The ISO
+              images are designed to be deployed on a USB stick.  There might be some relics in 
+              the machine directory.  For example, there is the "emenlow-bernard-5.0.0.tar.bz2" 
+              file.  Nobody seems to know what this is.  If a developer needs the image and the 
+              root filesystem I think that they want the small kernel image and a matching root 
+              filesystem.  Although, Paul Eggleton says that the HDDIMG types could be used to 
+              develop on.  I am not sure that we can use one of those in the ADT though as they 
+              want you to point to the kernel image and the target root filesystem.  Maybe you 
+              could just point to the same spot.  I am not sure.
+-->
+
+                <listitem><para><emphasis>Secure the Linux Yocto Kernel Target Image</emphasis>:  
+                    You must have a target kernel image that has been built using the Yocto Project.</para>
+                    <para>Depending on whether the Yocto Project has a pre-built image that matches your target
+                    architecture and where you are going to run the image while you develop your application
+                    (QEMU or real hardware), the area you get the image from differs.
+                        <itemizedlist>
+                            <listitem><para>Download the image from  
+                                <ulink url='http://www.yoctoproject.org/downloads/yocto-1.1/machines/'>  
+                                <filename>machines</filename></ulink> if your target architecture is supported
+                                and you are going to develop and test your application on actual hardware. 
+                                </para></listitem>
+                            <listitem><para>Download the image from the 
+                                <ulink url='http://www.yoctoproject.org/downloads/yocto-1.1/machines/qemu/'>  
+                                <filename>machines/qemu</filename></ulink> if your target architecture is supported
+                                and you are going to develop and test your application using the QEMU 
+                                emulator.</para></listitem>
+                            <listitem><para>Build your image if you cannot find a pre-built image that matches
+                                your target architecture.
+                                If your target architecture is similar to a supported architecture, you can 
+                                modify the kernel image before you build it.
+                                See the 
+                                "<link linkend='kernel-modification-workflow'>Kernel Modification Workflow</link>"
+                                section earlier in this manual for information on how to create a modified 
+                                Linux Yocto kernel.</para></listitem>
+                        </itemizedlist></para>
+                    <para>For information on pre-built kernel image naming schemes for images 
+                    that can run on the QEMU emulator, see the
+                    "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#using-pre-built'>Using Pre-Built Binaries and QEMU</ulink>"
+                    section in  
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
+                    The Yocto Project Quick Start</ulink>.</para></listitem>
+                <listitem><para><emphasis>Install the ADT</emphasis>:  
+                    The ADT provides a target-specific cross-development toolchain, the root filesystem,
+                    the QEMU emulator, and other tools that can help you develop your application.
+                    While it is possible to get these pieces separately, the Yocto Project provides an 
+                    easy method.
+                    You can get these pieces by running an ADT installer script, which is configurable.
+                    For information on how to install the ADT, see the
+                    "<ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html#using-the-adt-installer'>Using the ADT Installer</ulink>" section in
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html'>The Yocto Project
+                    Application Development (ADT) User's Manual</ulink>.</para></listitem>
+                <listitem><para><emphasis>If Applicable, Secure the Target Root Filesystem</emphasis>:  
+                    If you choose not to install the ADT using the ADT Installer,
+                    you need to find and download the 
+                    appropriate root filesystems.
+                    You can find these tarballs in the same areas used for the kernel images.
+                    Depending on the type of image you are running, the root filesystem you need differs. 
+                    For example, if you are developing an application that runs on an image that 
+                    supports Sato, you need to get root filesystem that supports Sato.
+                    </para></listitem>
+                <listitem><para><emphasis>Create and Build your Application</emphasis>:  
+                    At this point, you need to have source files for your application.
+                    Once you have the files, you can use the Eclipse IDE to import them and build the 
+                    project. 
+                    If you are not using Eclipse, you need to use the cross-development tools you have 
+                    installed to create the image.</para></listitem>                      
+                <listitem><para><emphasis>Deploy the Image with the Application</emphasis>:  
+                    If you are using the Eclipse IDE, you can deploy your image to the hardware or to 
+                    QEMU through the project's preferences.  
+                    If you are not using the Eclipse IDE, then you need to deploy the application using 
+                    other methods to the hardware.
+                    Or, if you are using QEMU, you need to use that tool and load your image in for testing. 
+                    </para></listitem>                      
+                <listitem><para><emphasis>Test and Debug the Application</emphasis>:  
+                    Once your application is deployed, you need to test it.
+                    Within the Eclipse IDE, you can use the debubbing environment along with the 
+                    set of user-space tools installed along with the ADT to debug your application. 
+                    Of course, the same user-space tools are available separately to use if you choose
+                    not to use the Eclipse IDE.</para></listitem>
+           </orderedlist>
+        </para>
+    </section>
+
+    <section id='workflow-without-adt'>
+        <title>Workflow Without ADT</title>
+
+        <para>
+            If you want to develop an application outside of the Yocto Project ADT environment, you 
+            can still employ the cross-development toolchain, the QEMU emulator, and a number of supported
+            target image files.  
+            You just need to follow these general steps:
+            <orderedlist>
+                <listitem><para><emphasis>Install the cross-development toolchain for your target hardware:</emphasis> 
+                    For information on how to install the toolchain, see the
+                    "<ulink url='http://www.yoctoproject/docs/1.1/adt-manual/adt-manual.html#using-an-existing-toolchain-tarball'>Using a Cross-Toolchain Tarball</ulink>" section in
+                    <ulink url='http://www.yoctoproject/docs/1.1/adt-manual/adt-manual.html'>The Yocto Project
+                    Application Development (ADT) User's Manual</ulink>.</para></listitem>
+                <listitem><para><emphasis>Download the Target Image:</emphasis>  The Yocto Project supports
+                    several target architectures and has many pre-built kernel images and root filesystem 
+                    images.</para>
+                    <para>If you are going to develop your application on hardware, go to the 
+                    <ulink url='http://www.yoctoproject.org/downloads/yocto-1.1/machines/'>  
+                    <filename>machines</filename></ulink> download area and choose a target machine area
+                    from which to download the kernel image and root filesystem.
+                    This download area could have several files in it that support development using   
+                    actual hardware. 
+                    For example, the area might contain <filename>.hddimg</filename> files that combine the 
+                    kernel image with the filesystem, boot loaders, etc.
+                    Be sure to get the files you need for your particular development process.</para>
+                    <para>If you are going to develop your application and then run and test it using the QEMU
+                    emulator, go to the 
+                    <ulink url='http://www.yoctoproject.org/downloads/yocto-1.1/machines/qemu/'>  
+                    <filename>machines/qemu</filename></ulink> download area.
+                    From this area, go down into the directory for your target architecture
+                    (e.g. <filename>qemux86_64</filename> for an 
+                    <trademark class='registered'>Intel</trademark>-based 64-bit architecture).
+                    Download kernel, root filesystem, and any other files you need for your process.
+                    <note>In order to use the root filesystem in QEMU, you need to extract it.
+                    See the 
+                    "<ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html#extracting-the-root-filesystem'>Extracting the Root Filesystem</ulink>" section for information on how to extract the 
+                    root filesystem.</note></para></listitem>
+                <listitem><para><emphasis>Develop and Test your Application:</emphasis>  At this point, 
+                    you have the tools to develop your application.  
+                    If you need to separately install and use the QEMU emulator, you can go to 
+                    <ulink url='http://www.qemu.org'>QEMU Home Page</ulink> to download and learn about the 
+                    emulator.</para></listitem>
+            </orderedlist>
+        </para>
+    </section>
 </section>
 
 </chapter>

documentation/dev-manual/dev-manual-newbie.xml

@@ -7,12 +7,12 @@
 
 <para>
     This chapter helps you understand the Yocto Project as an open source development project.
-    In general, working in an open-source environment is very different than working in a 
+    In general, working in an open source environment is very different as compared to working in a 
     proprietary environment.  
     Additionally, the Yocto Project uses specific tools and constructs as part of its development 
     environment.  
     The chapter specifically addresses open source philosophy, licensing issues, code repositories, 
-    the open source distributed version control system Git, and best practices using Yocto Project.
+    the open source distributed version control system Git, and best practices using the Yocto Project.
 </para>
 
 <section id='open-source-philosophy'>
@@ -33,23 +33,21 @@
         stake in the software project.  
         The open source environment contains new copyright, licensing, domain, and consumer issues 
         that differ from the more traditional development environment.  
-        In an open source environment the end-product, source material, and documentation are 
+        In an open source environment, the end-product, source material, and documentation are 
         all available to the public at no cost.
     </para>
 
     <para>
         A benchmark example of an open source project is the Linux Kernel, which was initially conceived 
         and created by Finnish computer science student Linus Torvalds in 1991.  
-        Conversely, a good example of a non-open source project is the Windows family of operating 
-        systems developed by Microsoft Corporation.
+        Conversely, a good example of a non-open source project is the 
+        <trademark class='registered'>Windows</trademark> family of operating 
+        systems developed by <trademark class='registered'>Microsoft</trademark> Corporation.
     </para>
 
     <para>
         Wikipedia has a good historical description of the Open Source Philosophy  
         <ulink url='http://en.wikipedia.org/wiki/Open_source'>here</ulink>. 
-    </para>
-
-    <para>
         You can also find helpful information on how to participate in the Linux Community 
         <ulink url='http://ldn.linuxfoundation.org/book/how-participate-linux-community'>here</ulink>.
     </para>
@@ -66,21 +64,21 @@
         From the interface, you can click on any particular item in the "Name" column and 
         see the URL at the bottom of the page that you need to set up a Git repository for 
         that particular item.
-        The ability to create Git repositories of the Yocto Project source allows you to 
+        Having a local Git repository of the Yocto Project files allows you to 
         make changes, contribute to the history, and ultimately enhance the Yocto Project's 
         tools, Board Support Packages, and so forth.
     </para>
 
     <para>  
         Conversely, if you are a developer that is not interested in contributing back to the 
-        Yocto Project you have the ability to simply download and extract release tarballs
+        Yocto Project, you have the ability to simply download and extract release tarballs
         and use them within the Yocto Project environment.
         All that is required is a particular release of Yocto Project, a kernel, and 
         your application source code.  
     </para>
 
     <para>
-        For any supported release of Yocto Project you can go to the Yocto Project website’s 
+        For any supported release of Yocto Project, you can go to the Yocto Project website’s 
         <ulink url='http://www.yoctoproject.org/download'>download page</ulink> and get a 
         tarball of the release.  
         You can also go to this site to download any supported BSP tarballs.
@@ -103,12 +101,13 @@
                 <para>
                 <imagedata fileref="figures/source-repos.png" align="center" width="6in" depth="4in" />
                 </para></listitem>
-            <listitem><para><anchor id='index-downloads' /><emphasis><ulink url='http://autobuilder.yoctoproject.org/downloads/'>Index of /downloads:</ulink></emphasis>
-                This area contains an index of the Eclipse-plugin, miscellaneous support, poky, pseudo, and 
-                all released versions of Yocto Project in the form of images or tarballs.
+            <listitem><para><anchor id='index-downloads' /><emphasis><ulink url='http://www.yoctoproject.org/downloads/'>Index of /downloads:</ulink></emphasis>
+                This area contains an index of downloads such as 
+                the <trademark class='trade'>Eclipse</trademark>
+                Yocto Plug-in, miscellaneous support, Poky, pseudo, cross-development toolchains,
+                and all released versions of Yocto Project in the form of images or tarballs.
                 Downloading and extracting these files does not produce a Git repository but rather 
-                a snapshot of a particular release or image. 
-                [WRITER NOTE: link will be http://downloads.yoctoproject.org.]</para>
+                a snapshot of a particular release or image.</para>
                 <para>
                 <imagedata fileref="figures/index-downloads.png" align="center" width="6in" depth="4in" />
                 </para></listitem>
@@ -116,7 +115,7 @@
                 This page on the Yocto Project website allows you to download any Yocto Project
                 release or Board Support Package (BSP) in tarball form.
                 The tarballs are similar to those found in the 
-                <ulink url='http://autobuilder.yoctoproject.org/downloads/'>Index of /downloads:</ulink> area.</para>
+                <ulink url='http://www.yoctoproject.org/downloads/'>Index of /downloads:</ulink> area.</para>
                 <para>
                 <imagedata fileref="figures/yp-download.png" align="center" width="6in" depth="4in" />
             </para></listitem>
@@ -130,77 +129,119 @@
     <para>
         Following is a list of terms and definitions users new to the Yocto Project development 
         environment might find helpful.
-        Some terms are universal but are included here just in case:
+        While some of these terms are universal, the list includes them just in case:
     <itemizedlist>
-        <listitem><para><emphasis>Image</emphasis> - An image is the result produced when 
+        <listitem><para><emphasis>Append Files:</emphasis> Files that append build information to 
+            a recipe file.  
+            Information in append files override the information in the similarly-named recipe file.
+            Append files use the <filename>.bbappend</filename> filename suffix.</para></listitem>
+        <listitem><para><emphasis>BitBake:</emphasis> The task executor and scheduler used by 
+            the Yocto Project to build images. 
+            For more information on BitBake, see the <ulink url='http://bitbake.berlios.de/manual/'>
+            BitBake documentation</ulink>.</para></listitem>
+        <listitem><para><emphasis>Classes:</emphasis> Files that provide for logic encapsulation
+            and inheritance allowing commonly used patterns to be defined once and easily used 
+            in multiple recipes.  
+            Class files end with the <filename>.bbclass</filename> filename extension.</para></listitem>
+        <listitem><para><emphasis>Configuration File:</emphasis>  Configuration information in the 
+            <filename>.conf</filename> files provides global definitions of variables.  
+            The <filename>conf/local.conf</filename> configuration file in the Yocto Project 
+            build directory defines user-defined variables that affect each build.  
+            The <filename>distro/poky.conf</filename> configuration file also in the 
+            build directory defines Yocto ‘distro’ configuration 
+            variables used only when building with this policy.  
+            Machine configuration files, which 
+            are located throughout the Yocto Project file structure, define
+            variables for specific hardware and are only used when building for that target 
+            (e.g. the <filename>machine/beagleboard.conf</filename> configuration file defines 
+            variables for the Texas Instruments ARM Cortex-A8 development board).  
+            Configuration files end with a <filename>.conf</filename> filename extension.</para></listitem>
+        <listitem><para><emphasis>Cross-Development Toolchain:</emphasis> A collection of software development
+            tools and utilities that allow you to develop software for targeted architectures.
+            This toolchain contains cross-compilers, linkers, and debuggers that are specific to 
+            an architecure.
+            You can use the Yocto Project to build cross-development toolchains in tarball form that when 
+            unpacked contain the development tools you need to cross-compile and test your software.
+            The Yocto Project ships with images that contain toolchains for supported architectures
+            as well.
+            Sometimes this toolchain is referred to as the meta-toolchain.</para></listitem>
+        <listitem><para><emphasis>Image:</emphasis> An image is the result produced when 
             BitBake processes a given collection of recipes and related metadata.
             Images are the binary output that runs on specific hardware and for specific
             use cases.
             For a list of the supported image types that the Yocto Project provides, see the
-            <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>
-            Reference: Images</ulink> appendix in
+            "<ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>Reference: Images</ulink>"
+            appendix in
             <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
             The Yocto Project Reference Manual</ulink>.</para></listitem>
-        <listitem><para><emphasis>Recipe</emphasis> - A set of instructions for building packages.  
-            A recipe describes where you get source code and which patches to apply.
-            Recipes describe dependencies for libraries or for other recipes and they 
-            also contain configuration and compilation options.  
-            Recipes contain the logical unit of execution, the software/images to build, and 
-            use the <filename>.bb</filename> file extension.</para></listitem>
-        <listitem><para><emphasis>BitBake</emphasis> - The task executor and scheduler used by Yocto Project
-            to build images. 
-            For more information on BitBake, see the <ulink url='http://bitbake.berlios.de/manual/'>
-            BitBake documentation</ulink>.</para></listitem>
-        <listitem><para><emphasis>Package</emphasis> - The packaged output from a baked recipe.
-            A package is generally the compiled binaries produced from the recipe's sources.  
-            You ‘bake’ something by running it through BitBake.</para></listitem>
-        <listitem><para><emphasis>Layer</emphasis> - A collection of recipes representing the core, 
+        <listitem><para><emphasis>Layer:</emphasis> A collection of recipes representing the core, 
             a BSP, or an application stack.</para></listitem>
-        <listitem><para><emphasis>Metadata</emphasis> - A term used throughout the Yocto Project 
-            documentation that refers to the files that BitBake parses when building an image. 
+        <listitem><para><emphasis>Metadata:</emphasis> The files that BitBake parses when building an image. 
             Metadata includes recipes, classes, and configuration files.</para></listitem>
-        <listitem><para><emphasis>Meta-Toolchain</emphasis> - A collection of software development
-            tools and utilities that allow you to develop software for targeted architectures.
-            These toolchains contain cross-compilers, linkers, and debuggers that are specific to 
-            an architecure.
-            You can use the Yocto Project to build meta-toolchains in tarball form that when 
-            unpacked contain the development tools you need to cross-compile and test your software.
-            The Yocto Project ships with images that contain toolchains for supported architectures
-            as well.</para></listitem>
-        <listitem><para><emphasis>Configuration File</emphasis>:  Configuration information in the 
-            <filename>.conf</filename> files provides global definitions of variables.  
-            The <filename>build/conf/local.conf</filename> configuration file defines user-defined variables
-            that effect each build.  
-            The <filename>distro/poky.conf</filename> configuration file defines Yocto ‘distro’ configuration 
-            variables used only when building with this policy.  
-            The <filename>machine/beagleboard.conf</filename> configuration file defines variables
-            for the Beagleboard and are only used when building for that target 
-            (i.e. Texas Instruments ARM Cortex-A8 development board).  
-            Configuration files end with a <filename>.conf</filename> filename extension.</para></listitem>
-        <listitem><para><emphasis>Classes</emphasis> - Files that provide for logic encapsulation
-            and inheritance allowing commonly used patterns to be defined once and easily used 
-            in multiple recipes.  
-            Class files end with the <filename>.bbclass</filename> filename extension.</para></listitem>
-        <listitem><para><emphasis>Append Files</emphasis> - Files that append build information to 
-            a recipe file.  
-            Information in append files override the information in the similarly-named recipe file.
-            Append files use the <filename>.bbappend</filename> filename suffix.</para></listitem>
-        <listitem><para><emphasis>Tasks</emphasis> - Arbitrary groups of software Recipes.  
-            You simply use Tasks to hold recipes that when built usually accomplish a single task.  
-            For example, a task could contain the recipes for a company’s proprietary or value-add software.  
-            Or the task could contain the recipes that enable graphics. 
-            A task is really just another recipe.  
-            Because task files are recipes, they end with the <filename>.bb</filename> filename 
-            extension.</para></listitem>
-        <listitem><para><emphasis>OE-Core</emphasis> - A core set of metadata originating 
+        <listitem><para><emphasis>OE-Core:</emphasis> A core set of metadata originating 
             with OpenEmbedded (OE) that is shared between OE and the Yocto Project.
             This metadata is found in the <filename>meta</filename> directory of the Yocto Project
             files.</para></listitem>
-        <listitem><para><emphasis>Upstream</emphasis> - A reference to source code or repositories
+        <listitem><para><emphasis>Package:</emphasis> The packaged output from a baked recipe.
+            A package is generally the compiled binaries produced from the recipe's sources.  
+            You ‘bake’ something by running it through BitBake.</para></listitem>
+        <listitem><para><emphasis>Poky:</emphasis> The build tool that the Yocto Project 
+            uses to create images.</para></listitem>
+        <listitem><para><emphasis>Recipe:</emphasis> A set of instructions for building packages.  
+            A recipe describes where you get source code and which patches to apply.
+            Recipes describe dependencies for libraries or for other recipes, and they 
+            also contain configuration and compilation options.  
+            Recipes contain the logical unit of execution, the software/images to build, and 
+            use the <filename>.bb</filename> file extension.</para></listitem>
+        <listitem><para><emphasis>Tasks:</emphasis> Arbitrary groups of software Recipes.  
+            You simply use Tasks to hold recipes that, when built, usually accomplish a single task.  
+            For example, a task could contain the recipes for a company’s proprietary or value-add software.  
+            Or, the task could contain the recipes that enable graphics. 
+            A task is really just another recipe.  
+            Because task files are recipes, they end with the <filename>.bb</filename> filename 
+            extension.</para></listitem>
+        <listitem><para><emphasis>Upstream:</emphasis> A reference to source code or repositories
             that are not local to the development system but located in a master area that is controlled
             by the maintainer of the source code.
-            For example, in order for a developer to work on a particular piece of code they need to 
+            For example, in order for a developer to work on a particular piece of code, they need to 
             first get a copy of it from an "upstream" source.</para></listitem>
+        <listitem><para><emphasis>Yocto Project Files:</emphasis>
+            This term refers to the directory structure created as a result of downloading 
+            and unpacking a Yocto Project release tarball or setting up a Git repository
+            by cloning <filename>git://git.yoctoproject.org/poky</filename>.
+            Sometimes the term "the Yocto Project Files structure" is used as well.</para>
+            <para>The Yocto Project files contain BitBake, Documentation, metadata and 
+            other files that all support the development environment. 
+            Consequently, you must have the Yocto Project files in place on your development 
+            system in order to do any development using the Yocto Project.</para>
+            <para>The name of the top-level directory of the Yocto Project file structure  
+            is derived from the Yocto Project release tarball.
+            For example, downloading and unpacking <filename>poky-edison-6.0.tar.bz2</filename>
+            results in a Yocto Project file structure whose Yocto Project source directory is named 
+            <filename>poky-edison-6.0</filename>.
+            If you create a Git repository, then you can name the repository anything you like.</para>
+            <para>You can find instruction on how to set up the Yocto Project files on your 
+            host development system by reading 
+            the 
+            "<ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#getting-setup'>Getting
+            Setup</ulink>" section.</para></listitem>
+        <listitem><para><emphasis>Yocto Project Build Directory:</emphasis>
+            This term refers to the area used by the Yocto Project for builds.  
+            The area is created when you <filename>source</filename> the Yocto Project setup 
+            environment script that is found in the Yocto Project files area. 
+            (e.g. <filename>oe-init-build-env</filename>).
+            You can create the Yocto Project build directory anywhere you want on your 
+            development system.
+            Here is an example that creates the directory in <filename>mybuilds</filename> 
+            and names the Yocto Project build directory <filename>YP-6.0</filename>:
+            <literallayout class='monospaced'> 
+     $ source poky-edison-6.0/oe-init-build-env $HOME/mybuilds/YP-6.0
+            </literallayout>
+            If you don't specifically name the directory, BitBake creates it 
+            in the current directory and uses the name <filename>build</filename>.
+            Also, if you supply an existing directory, then BitBake uses that 
+            directory as the Yocto Project build directory and populates the build hierarchy
+            beneath it.</para></listitem>
     </itemizedlist>
     </para>
 </section>
@@ -209,9 +250,9 @@
     <title>Licensing</title>
 
     <para>
-        Because open source projects are open to the public they have different licensing structures in place.  
+        Because open source projects are open to the public, they have different licensing structures in place.  
         License evolution for both Open Source and Free Software has an interesting history.  
-        If you are interested in the history you can find basic information here:
+        If you are interested in this history, you can find basic information here:
     <itemizedlist>
         <listitem><para><ulink url='http://en.wikipedia.org/wiki/Open-source_license'>Open source license history</ulink>
             </para></listitem>
@@ -235,15 +276,20 @@
 
     <para>
         When you build an image using Yocto Project, the build process uses a known list of licenses to 
-        ensure compliance.  
-        Once the build completes, the list of all licenses found and used during the build are 
-        kept in the resulting build directory at 
-        <filename>&lt;build_directory&gt;/tmp/deploy/images/licenses</filename>.  
+        ensure compliance.
+        You can find this list in the Yocto Project files directory at 
+        <filename>meta/files/common-licenses</filename>.  
+        Once the build completes, the list of all licenses found and used during that build are 
+        kept in the Yocto Project build directory at 
+        <filename>tmp/deploy/images/licenses</filename>.
+    </para>
+
+    <para>  
         If a module requires a license that is not in the base list, the build process 
         generates a warning during the build.  
         These tools make it easier for a developer to be certain of the licenses with which
         their shipped products must comply.
-        However, it is still up to the developer to resolve potential licensing issues.
+        However, even with these tools it is still up to the developer to resolve potential licensing issues.
     </para>
 
     <para>
@@ -254,14 +300,13 @@
         for a standard format for communicating the components, licenses, and copyrights 
         associated with a software package.  
         <ulink url='http://opensource.org'>OSI</ulink> is a corporation dedicated to the Open Source 
-        Definition and the effort for reviewing 
-        and approving licenses that are OSD-conformant.  
+        Definition and the effort for reviewing and approving licenses that are OSD-conformant.  
     </para>
 
     <para>
         You can find a list of the combined SPDX and OSI licenses that the Yocto Project uses 
         <ulink url='http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/files/common-licenses'>here</ulink>.
-        The wiki page discusses the license infrastructure used by the Yocto Project.
+        This wiki page discusses the license infrastructure used by the Yocto Project.
     </para>
 </section>
 
@@ -282,7 +327,7 @@
         You do not have to be an expert in Git to be functional.  
         A good place to look for instruction on a minimal set of Git commands is 
         <ulink url='http://git-scm.com/documentation'>here</ulink>.   
-        If you need to download Git you can do so 
+        If you need to download Git, you can do so 
         <ulink url='http://git-scm.com/download'>here</ulink>. 
     </para>
 
@@ -294,7 +339,7 @@
         This methodology also allows for an environment in which you can do lots of 
         experimentation on your project as you develop changes or new features.  
         For example, you can create a “branch”, experiment with some feature, and then 
-        if you like the feature you incorporate the branch into the tree.  
+        if you like the feature, you incorporate the branch into the tree.  
         If you don’t, you cut the branch off by deleting it.  
     </para>
 
@@ -309,55 +354,63 @@
         omits the many arguments they support.  
         See the Git documentation for complete descriptions and strategies on how to use these commands:
     <itemizedlist>
-        <listitem><para><emphasis><filename>git init</filename></emphasis> – Initializes an empty Git repository.  
+        <listitem><para><emphasis><filename>git init</filename>:</emphasis> Initializes an empty Git repository.  
             You cannot use Git commands unless you have a <filename>.git</filename> repository.</para></listitem>
-        <listitem><para><emphasis><filename>git clone</filename></emphasis> – Creates a clone of a repository.  
-            During collaboration this command allows you to create a local repository that is on 
+        <listitem><para><emphasis><filename>git clone</filename>:</emphasis> Creates a clone of a repository.  
+            During collaboration, this command allows you to create a local repository that is on 
             equal footing with a fellow developer’s repository.</para></listitem>
-        <listitem><para><emphasis><filename>git add</filename></emphasis> – Adds updated file contents to the index that 
+        <listitem><para><emphasis><filename>git add</filename>:</emphasis> Adds updated file contents 
+            to the index that 
             Git uses to track changes.  
-            All files that have changed must be added before they can be committed.</para></listitem>
-        <listitem><para><emphasis><filename>git commit</filename></emphasis> – Creates a “commit” that documents 
+            You must add all files that have changed before you can commit them.</para></listitem>
+        <listitem><para><emphasis><filename>git commit</filename>:</emphasis> Creates a “commit” that documents 
             the changes you made.  
             Commits are used for historical purposes, for determining if a maintainer of a project 
             will allow the change, and for ultimately pushing the change from your local Git repository 
             into the project’s upstream (or master) repository.</para></listitem>
-        <listitem><para><emphasis><filename>git status</filename></emphasis> – Reports any modified files that 
+        <listitem><para><emphasis><filename>git status</filename>:</emphasis> Reports any modified files that 
             possibly need added and committed.</para></listitem>
-        <listitem><para><emphasis><filename>git checkout &lt;branch-name&gt;</filename></emphasis> - Changes 
-            your working branch.  This command is analogous to “cd”.</para></listitem>
-        <listitem><para><emphasis><filename>git checkout –b &lt;working-branch&gt;</filename></emphasis> - Creates 
+        <listitem><para><emphasis><filename>git checkout &lt;branch-name&gt;</filename>:</emphasis> Changes 
+            your working branch.  
+            This command is analogous to “cd”.</para></listitem>
+        <listitem><para><emphasis><filename>git checkout –b &lt;working-branch&gt;</filename>:</emphasis> Creates 
             a working branch on your local machine where you can isolate work.  
             It is a good idea to use local branches when adding specific features or changes.  
             This way if you don’t like what you have done you can easily get rid of the work.</para></listitem>
-        <listitem><para><emphasis><filename>git branch</filename></emphasis> – Reports existing branches and 
+        <listitem><para><emphasis><filename>git branch</filename>:</emphasis> Reports existing branches and 
             tells you which branch in which you are currently working.</para></listitem>
-        <listitem><para><emphasis><filename>git branch -D &lt;branch-name&gt;</filename></emphasis> – 
-            Deletes an existing branch.  You need to be in a branch other than the one you are deleting 
+        <listitem><para><emphasis><filename>git branch -D &lt;branch-name&gt;</filename>:</emphasis> 
+            Deletes an existing branch.  
+            You need to be in a branch other than the one you are deleting 
             in order to delete &lt;branch-name&gt;.</para></listitem>
-        <listitem><para><emphasis><filename>git pull</filename></emphasis> – Retrieves information from an upstream Git 
+        <listitem><para><emphasis><filename>git pull</filename>:</emphasis> Retrieves information 
+            from an upstream Git 
             repository and places it in your local Git repository.  
-            You use this command to make sure you are synchronized with the upstream repository 
-            from which the project’s maintainer uses to pull changes into the master repository.</para></listitem>
-        <listitem><para><emphasis><filename>git push</filename></emphasis> – Sends all your local changes you 
-            have committed to an upstream Git repository.  
+            You use this command to make sure you are synchronized with the repository 
+            from which you are basing changes (.e.g. the master repository).</para></listitem>
+        <listitem><para><emphasis><filename>git push</filename>:</emphasis> Sends all your local changes you 
+            have committed to an upstream Git repository (e.g. a contribution repository).  
             The maintainer of the project draws from these repositories when adding your changes to the 
             project’s master repository.</para></listitem>
-        <listitem><para><emphasis><filename>git merge</filename></emphasis> – Combines or adds changes from one 
+        <listitem><para><emphasis><filename>git merge</filename>:</emphasis> Combines or adds changes from one 
             local branch of your repository with another branch.  
-            When you create a local Git repository the default branch is named “master”.  
+            When you create a local Git repository, the default branch is named “master”.  
             A typical workflow is to create a temporary branch for isolated work, make and commit your 
-            changes, switch to the master branch, merge the changes from the temporary branch into the 
-            master branch, and then delete the temporary branch</para></listitem>
-        <listitem><para><emphasis><filename>git cherry-pick</filename></emphasis> – Choose and apply specific 
+            changes, switch to your local master branch, merge the changes from the temporary branch into the 
+            local master branch, and then delete the temporary branch.</para></listitem>
+        <listitem><para><emphasis><filename>git cherry-pick</filename>:</emphasis> Choose and apply specific 
             commits from one branch into another branch.  
             There are times when you might not be able to merge all the changes in one branch with 
             another but need to pick out certain ones.</para></listitem>
-        <listitem><para><emphasis><filename>gitk</filename></emphasis> – Provides a GUI view of the branches 
+        <listitem><para><emphasis><filename>gitk</filename>:</emphasis> Provides a GUI view of the branches 
             and changes in your local Git repository.  
-            This command is a good way to see where things have diverged in your local repository.</para></listitem>
-        <listitem><para><emphasis><filename>git log</filename></emphasis> – Reports a history of your changes to the 
+            This command is a good way to graphically see where things have diverged in your 
+            local repository.</para></listitem>
+        <listitem><para><emphasis><filename>git log</filename>:</emphasis> Reports a history of your changes to the 
             repository.</para></listitem>
+        <listitem><para><emphasis><filename>git diff</filename>:</emphasis> Displays line-by-line differences
+            between your local working files and the same files in the upstream Git repository that your 
+            branch currently tracks.</para></listitem>
     </itemizedlist>
     </para>
 </section>
@@ -369,17 +422,22 @@
         This section provides some overview on workflows using Git.  
         In particular, the information covers basic practices that describe roles and actions in a 
         collaborative development environment.  
-        Again, if you are familiar with this type of development environment you might want to just skip the section. 
+        Again, if you are familiar with this type of development environment, you might want to just 
+        skip the section. 
     </para>
 
     <para>
         The Yocto Project files are maintained using Git in a "master" branch whose Git history 
         tracks every change and whose structure provides branches for all diverging functionality.
-        Although there is no need to use Git, This practice is typical for open-source projects.
-        For the Yocto Project a key individual called the "maintainer" is responsible for "master".  
+        Although there is no need to use Git, many open source projects do so.
+        For the Yocto Project, a key individual called the "maintainer" is responsible for the "master"
+        branch of the Git repository.
         The "master" branch is the “upstream” repository where the final builds of the project occur.  
         The maintainer is responsible for allowing changes in from other developers and for 
         organizing the underlying branch structure to reflect release strategies and so forth.  
+        <note>You can see who is the maintainer for Yocto Project files by examining the 
+        <filename>distro_tracking_fields</filename> file in the Yocto Project 
+        <filename>meta/conf/distro/include</filename> directory.</note>  
     </para>
 
     <para>
@@ -394,7 +452,7 @@
         Developers (including contributing community members) create and maintain cloned repositories 
         of the upstream "master" branch.  
         These repositories are local to their development platforms and are used to develop changes.  
-        When a developer is satisfied with a particular feature or change they “push” the changes 
+        When a developer is satisfied with a particular feature or change, they “push” the changes 
         to the appropriate "contrib" repository.
     </para>
 
@@ -430,53 +488,53 @@
         The following list describes some of these practices.  
         For more detailed information about these strategies see 
         <ulink url='http://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html'>Git Workflows</ulink>. 
-    <itemizedlist>
-        <listitem><para><emphasis>Make Small Changes</emphasis> - It is best to keep your changes you commit 
-            small as compared to bundling many disparate changes into a single commit.  
-            This practice not only keeps things manageable but also allows the maintainer 
-            to more easily include or refuse changes.</para>
-            <para>It is also good practice to leave the repository in a state that allows you to 
-            still successfully build your project.</para></listitem>
-        <listitem><para><emphasis>Use Branches Liberally</emphasis> - It is very easy to create, use, and 
-            delete local branches in your working Git repository.  
-            You can name these branches anything you like.  
-            It is helpful to give them names associated with the particular feature or change 
-            on which you are working.  
-            Once you are done with a feature or change you simply discard the branch.</para></listitem>
-        <listitem><para><emphasis>Merge Changes</emphasis> - The <filename>git merge</filename>
-            command allows you to take the 
-            changes from one branch and fold them into another branch.  
-            This process is especially helpful when more than a single developer might be working 
-            on different parts of the same feature.  
-            Merging changes also automatically identifies any collisions or “conflicts” 
-            that might happen resulting from the same lines of code being altered by two different 
-            developers.</para></listitem>
-        <listitem><para><emphasis>Manage Branches</emphasis> - Because branches are easy to use, you should 
-            use a system where branches indicate varying levels of code readiness.  
-            For example, you can have a “work” branch to develop in, a “test” branch where the code or 
-            change is tested, a “stage” branch where changes are ready to be committed, and so forth.  
-            As your project develops, you can merge code across the branches to reflect ever-increasing 
-            stable states of the development.</para></listitem>
-        <listitem><para><emphasis>Use Push and Pull</emphasis> - The push-pull workflow is based on the 
-            concept of developers “pushing” local commits to a remote repository, which is 
-            usually a contribution repository.  
-            It is also based on the developers “pulling” known states of the project down into their 
-            local development repositories.  
-            This workflow easily allows you to pull changes submitted by other developers from the 
-            upstream repository into your work area ensuring that you have the most recent software 
-            on which to develop.
-            The Yocto Project has two scripts named <filename>create-pull-request</filename> and 
-            <filename>send-pull-request</filename> that ship with the release to facilitate this 
-            workflow.
-            You can find these scripts in the local Yocto Project files Git repository in
-            <filename>scripts</filename>.</para></listitem>
-        <listitem><para><emphasis>Patch Workflow</emphasis> - This workflow allows you to notify the 
-            maintainer through an email that you have a change (or patch) you would like considered 
-            for the "master" branch of the Git repository.  
-            To send this type of change you format the patch and then send the email using the Git commands 
-            <filename>git format-patch</filename> and <filename>git send-email</filename>. 
-            You can find information on how to submit later in this chapter.</para></listitem>
-    </itemizedlist>
+        <itemizedlist>
+            <listitem><para><emphasis>Make Small Changes:</emphasis> It is best to keep your changes you commit 
+                small as compared to bundling many disparate changes into a single commit.  
+                This practice not only keeps things manageable but also allows the maintainer 
+                to more easily include or refuse changes.</para>
+                <para>It is also good practice to leave the repository in a state that allows you to 
+                still successfully build your project.</para></listitem>
+            <listitem><para><emphasis>Use Branches Liberally:</emphasis> It is very easy to create, use, and 
+                delete local branches in your working Git repository.  
+                You can name these branches anything you like.  
+                It is helpful to give them names associated with the particular feature or change 
+                on which you are working.  
+                Once you are done with a feature or change, simply discard the branch.</para></listitem>
+            <listitem><para><emphasis>Merge Changes:</emphasis> The <filename>git merge</filename>
+                command allows you to take the 
+                changes from one branch and fold them into another branch.  
+                This process is especially helpful when more than a single developer might be working 
+                on different parts of the same feature.  
+                Merging changes also automatically identifies any collisions or “conflicts” 
+                that might happen as a result of the same lines of code being altered by two different 
+                developers.</para></listitem>
+            <listitem><para><emphasis>Manage Branches:</emphasis> Because branches are easy to use, you should 
+                use a system where branches indicate varying levels of code readiness.  
+                For example, you can have a “work” branch to develop in, a “test” branch where the code or 
+                change is tested, a “stage” branch where changes are ready to be committed, and so forth.  
+                As your project develops, you can merge code across the branches to reflect ever-increasing 
+                stable states of the development.</para></listitem>
+            <listitem><para><emphasis>Use Push and Pull:</emphasis> The push-pull workflow is based on the 
+                concept of developers “pushing” local commits to a remote repository, which is 
+                usually a contribution repository.  
+                This workflow is also based on developers “pulling” known states of the project down into their 
+                local development repositories.  
+                The workflow easily allows you to pull changes submitted by other developers from the 
+                upstream repository into your work area ensuring that you have the most recent software 
+                on which to develop.
+                The Yocto Project has two scripts named <filename>create-pull-request</filename> and 
+                <filename>send-pull-request</filename> that ship with the release to facilitate this 
+                workflow.
+                You can find these scripts in the local Yocto Project files Git repository in
+                <filename>scripts</filename>.</para></listitem>
+            <listitem><para><emphasis>Patch Workflow:</emphasis> This workflow allows you to notify the 
+                maintainer through an email that you have a change (or patch) you would like considered 
+                for the "master" branch of the Git repository.  
+                To send this type of change you format the patch and then send the email using the Git commands 
+                <filename>git format-patch</filename> and <filename>git send-email</filename>. 
+                You can find information on how to submit later in this chapter.</para></listitem>
+        </itemizedlist>
     </para>
 </section>
 
@@ -494,7 +552,7 @@
     <para>
         Sometimes it is helpful to submit, investigate, or track a bug against the Yocto Project itself
         such as when discovering an issue with some component of the build system that acts contrary 
-        to the documentation or expectations.  
+        to the documentation or your expectations.  
         You can find information 
         for Bugzilla configuration and bug tracking procedures specific to the Yocto Project 
         <ulink url='https://wiki.yoctoproject.org/wiki/Bugzilla_Configuration_and_Bug_Tracking'>here</ulink>.     
@@ -509,18 +567,18 @@
 
     <para>
         Here are some things to remember when dealing with bugs against the Yocto Project:   
-    <itemizedlist>
-        <listitem><para>The Yocto Project follows a naming bug-naming convention: 
-            <filename>[YOCTO #&lt;number&gt;]</filename>, where <filename>&lt;number&gt;</filename> is the 
-            assigned defect ID used in Bugzilla.  
-            So, for example, a valid way to refer to a defect when creating a commit comment 
-            would be <filename>[YOCTO 1011]</filename>.   
-            This convention becomes important if you are submitting patches against the Yocto Project 
-            code itself.
-            See the following section for more information.</para></listitem>
-        <listitem><para>Defects for Yocto Project fall into one of four classifications:  Yocto Projects, 
-            Infrastructure, Poky, and Yocto Metadata Layers.</para></listitem>
-    </itemizedlist>
+        <itemizedlist>
+            <listitem><para>The Yocto Project follows a bug-naming convention: 
+                <filename>[YOCTO #&lt;number&gt;]</filename>, where <filename>&lt;number&gt;</filename> is the 
+                assigned defect ID used in Bugzilla.  
+                So, for example, a valid way to refer to a defect when creating a commit comment 
+                would be <filename>[YOCTO #1011]</filename>.   
+                This convention becomes important if you are submitting patches against the Yocto Project 
+                code itself.
+                See the following section for more information.</para></listitem>
+            <listitem><para>Defects for Yocto Project fall into one of four classifications:  Yocto Projects, 
+                Infrastructure, Poky, and Yocto Metadata Layers.</para></listitem>
+        </itemizedlist>
     </para>
 </section>
 
@@ -529,9 +587,35 @@
 
     <para>
         Contributions to the Yocto Project are very welcome. 
-        You should send patches to the Yocto Project mailing list to get it in front of the 
-        Yocto Project Maintainer.  
-        When you send your patch, be sure to include a "signed-off-by:"
+        You should send patches to the appropriate Yocto Project mailing list to get them 
+        in front of the Yocto Project Maintainer.
+        For a list of the Yocto Project mailing lists, see the
+        "<ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#resources-mailinglist'>Mailing lists</ulink>" section in 
+        <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'> The 
+        Yocto Project Reference Manual</ulink>.
+    </para>
+
+    <para>
+        Following is some guidance on which mailing list to use for what type of defect:
+        <itemizedlist>
+            <listitem><para>For defects against the Yocto Project build system Poky, send 
+                your patch to the  
+                <ulink url='http://lists.yoctoproject.org/listinfo/poky'></ulink> mailing list. 
+                This mailing list corresponds to issues that are not specific to the Yocto Project but
+                are part of the OE-core.
+                For example, a defect against anything in the <filename>meta</filename> layer 
+                or the BitBake Manual could be sent to this mailing list.</para></listitem>
+            <listitem><para>For defects against Yocto-specific layers, tools, and Yocto Project 
+                documentation use the 
+                <ulink url='http://lists.yoctoproject.org/listinfo/yocto'></ulink> mailing list.
+                This mailing list corresponds to Yocto-specific areas such as 
+                <filename>meta-yocto</filename>, <filename>meta-intel</filename>, 
+                <filename>linux-yocto</filename>, and <filename>documentation</filename>.</para></listitem>
+        </itemizedlist>      
+    </para>
+
+    <para>  
+        When you send a patch, be sure to include a "signed-off-by:"
         line in the same style as required by the Linux kernel. 
         Adding this line signifies the developer has agreed to the Developer's Certificate of Origin 1.1
         as follows:
@@ -573,35 +657,82 @@
     <para>
         In a collaborative environment, it is necessary to have some sort of standard 
         or method through which you submit changes.  
-        Otherwise, things would get quite chaotic.  
+        Otherwise, things could get quite chaotic.  
     </para>
 
     <para>
-        When you submit a change or patch to the Yocto Project, you must follow certain procedures.  
-        In particular, the headers in patches and the commit messages must follow a certain standard.  
-        The general process is the same as described earlier in this chapter.  
-        For complete details on how to create proper commit messages and patch headers see 
-        [WRITER NOTE:  I need the link to Mark's wiki page here that describes the process.]
+        When you form a commit, you must follow certain standards established by the 
+        Yocto Project development team. 
+        For each commit, you must provide a single-line summary of the change and you 
+        almost always provide a more detailed description of what you did (i.e. the body 
+        of the commit).
+        The only exceptions for not providing a detailed description would be if your 
+        change is a simple, self-explanatory change that needs no description.
+        Here are the Yocto Project commit message guidelines:
+        <itemizedlist>
+            <listitem><para>Provide a single-line, short summary of the change.
+                This summary is typically viewable by source control systems.
+                Thus, providing something short and descriptive that gives the reader 
+                a summary of the change is useful when viewing a list of many commits.
+                </para></listitem>
+            <listitem><para>For the body of the commit message, provide detailed information
+                that describes what you changed, why you made the change, and the approach
+                you used.  
+                Provide as much detail as you can in the body of the commit message.
+                </para></listitem>
+            <listitem><para>If the change addresses a specific bug or issue that is 
+                associated with a bug-tracking ID, prefix your detailed description
+                with the bug or issue ID.  
+                For example, the Yocto Project tracks bugs using a bug-naming convention.
+                Any commits that address a bug must start with the bug ID in the description
+                as follows:
+                <literallayout class='monospaced'>
+     YOCTO #&lt;bug-id&gt;:  &lt;Detailed description of commit&gt;
+                </literallayout></para></listitem>
+        </itemizedlist>
+    </para>
+
+    <para>
+        You can find more guidance on creating well-formed commit messages at this OpenEmbedded 
+        wiki page:
+        <ulink url='http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines'></ulink>.
     </para>
 
     <para>
         Following are general instructions for both pushing changes upstream and for submitting changes as patches.
-    </para>
+    </para> 
 
     <section id='pushing-a-change-upstream'>
-        <title>Pushing a Change Upstream</title>
+        <title>Pushing a Change Upstream and Requesting a Pull</title>
 
         <para>
             The basic flow for pushing a change to an upstream "contrib" Git repository is as follows:
-        <itemizedlist>
-            <listitem><para>Make your changes in your local Git repository.</para></listitem>
-            <listitem><para>Stage your commit (or change) by using the <filename>git add</filename>
-                command.</para></listitem>
-            <listitem><para>Commit the change by using the <filename>git commit</filename>
-                command and push it to the upstream "contrib" repository.  
-                Be sure to provide a commit message that follows the project’s commit standards.</para></listitem>
-            <listitem><para>Notify the maintainer that you have pushed a change.</para></listitem>
-        </itemizedlist>
+            <itemizedlist>
+                <listitem><para>Make your changes in your local Git repository.</para></listitem>
+                <listitem><para>Stage your commit (or change) by using the <filename>git add</filename>
+                    command.</para></listitem>
+                <listitem><para>Commit the change by using the <filename>git commit</filename>
+                    command and push it to the "contrib" repository.  
+                    Be sure to provide a commit message that follows the project’s commit standards
+                    as described earlier.</para></listitem>
+                <listitem><para>Notify the maintainer that you have pushed a change by making a pull 
+                    request.
+                    The Yocto Project provides two scripts that conveniently let you generate and send
+                    pull requests to the Yocto Project.
+                    These scripts are <filename>create-pull-request</filename> and 
+                    <filename>send-pull-request</filename>.
+                    You can find these scripts in the <filename>scripts</filename> directory of the 
+                    Yocto Project file structure.</para>
+                    <para>For help on using these scripts, simply provide the 
+                    <filename>--help</filename> argument as follows:
+                    <literallayout class='monospaced'>
+     $ ~/poky/scripts/create-pull-request --help
+     $ ~/poky/scripts/send-pull-request --help
+                    </literallayout></para></listitem>
+            </itemizedlist>
+        </para>
+
+        <para>            
             You can find general Git information on how to push a change upstream 
             <ulink url='http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#Developing-With-git'>
             here</ulink>.
@@ -609,30 +740,62 @@
     </section>
 
     <section id='submitting-a-patch'>
-        <title>Submitting a Patch</title>
+        <title>Submitting a Patch Through Email</title>
 
         <para>
-            If you have a just a few changes you can commit them and then submit them as an email to the maintainer.
+            If you have a just a few changes, you can commit them and then submit them as an 
+            email to the maintainer.
             Here is a general procedure:
-        <itemizedlist>
-            <listitem><para>Make your changes in your local Git repository.</para></listitem>
-            <listitem><para>Stage your commit (or change) by using the <filename>git add</filename>
-                command.</para></listitem>
-            <listitem><para>Commit the change by using the <filename>git commit</filename> command.  
-                Be sure to provide a commit message that follows the project’s commit standards.</para></listitem>
-            <listitem><para>Format the commit by using the <filename>git format-patch</filename>
-                command.  
-                This step produces a numbered series of files in the current directory – one for 
-                each commit.</para></listitem>
-            <listitem><para>Import the files into your mail client by using the 
-                <filename>git-send-email</filename> command.</para></listitem>
-            <listitem><para>Send the email by hand to the maintainer.</para></listitem>
-        </itemizedlist>
-             Be aware that there could be protocols and standards that you need to follow for your particular 
-             project.
-             You can find general Git information for submitting a patch  
-             <ulink url='http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#sharing-development'>
-             here</ulink>. 
+            <itemizedlist>
+                <listitem><para>Make your changes in your local Git repository.</para></listitem>
+                <listitem><para>Stage your commit (or change) by using the <filename>git add</filename>
+                    command.</para></listitem>
+                <listitem><para>Commit the change by using the 
+                    <filename>git commit --signoff</filename> command.
+                    Using the <filename>--signoff</filename> option identifies you as the person 
+                    making the change and also satisfies the Developer's Certificate of 
+                    Origin (DCO) shown earlier.</para>
+                    <para>When you form a commit you must follow certain standards established by the 
+                    Yocto Project development team. 
+                    See the earlier section
+                    "<link linkend='how-to-submit-a-change'>How to Submit a Change</link>" 
+                    for Yocto Project commit message standards.</para></listitem>
+                <listitem><para>Format the commit into an email messsage.
+                    To format commits, use the <filename>git format-patch</filename> command.
+                    When you provide the command, you must include a revision list or a number of patches
+                    as part of the command.
+                    For example, these two commands each take the most recent single commit and 
+                    format it as an email message in the current directory:  
+                    <literallayout class='monospaced'>
+     $ git format-patch -1
+     $ git format-patch HEAD~
+                    </literallayout></para>
+                    <para>After the command is run, the current directory contains a 
+                    numbered <filename>.patch</filename> file for the commit.</para>
+                    <para>If you provide several commits as part of the command, 
+                    the <filename>git format-patch</filename> command produces a numbered 
+                    series of files in the current directory – one for each commit.
+                    For information on the <filename>git format-patch</filename> command, 
+                    see <filename>GIT_FORMAT_PATCH(1)</filename> displayed using the  
+                    <filename>man git-format-patch</filename> command.</para></listitem>
+                <listitem><para>Import the files into your mail client by using the 
+                    <filename>git send-email</filename> command.
+                    <note>In order to use <filename>git send-email</filename>, you must have the 
+                    the proper Git packages installed.
+                    For Ubuntu and Fedora the package is <filename>git-email</filename>.</note></para>
+                    <para>The <filename>git send-email</filename> command sends email by using a local
+                    or remote Mail Transport Agent (MTA) such as 
+                    <filename>msmtp</filename>, <filename>sendmail</filename>, or through a direct
+                    <filename>smtp</filename> configuration in your Git <filename>config</filename>
+                    file.</para>
+                    <para>The <filename>git send-email</filename> command is the preferred method
+                    for sending your patches since there is no risk of compromising whitespace
+                    in the body of the message, which can occur when you use your own mail client.
+                    The command also has several options that let you 
+                    specify recipients and perform further editing of the email message.
+                    For information on how to use the <filename>git send-email</filename> command,
+                    use the <filename>man git-send-email</filename> command.</para></listitem>
+            </itemizedlist>
         </para>
     </section>
 </section>

documentation/dev-manual/dev-manual-start.xml

@@ -7,16 +7,15 @@
 
 <para>
     This chapter introduces the Yocto Project and gives you an idea of what you need to get started.  
-    You can find enough information to set your development host up and build or use images for 
-    hardware supported by the Yocto Project by reading the 
-    <ulink url='http://www.yoctoproject.org/docs/yocto-quick-start/yocto-project-qs.html'>
-    Yocto Project Quick Start</ulink> located on the <ulink url='http://www.yoctoproject.org'>
-    Yocto Project website</ulink>.
+    You can find enough information to set up your development host and build or use images for 
+    hardware supported by the Yocto Project by reading  
+    <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
+    The Yocto Project Quick Start</ulink>.
 </para>
 
 <para>
     The remainder of this chapter summarizes what is in the Yocto Project Quick Start and provides 
-    some higher level concepts you might want to consider.
+    some higher-level concepts you might want to consider.
 </para>
 
 <section id='introducing-the-yocto-project'>
@@ -24,8 +23,8 @@
 
     <para>
         The Yocto Project is an open-source collaboration project focused on embedded Linux development.  
-        The project currently provides a build system and various ancillary tools suitable for the 
-        embedded developer.  
+        The project currently provides a build system, which is sometimes referred to as "Poky",
+        and provides various ancillary tools suitable for the embedded developer.  
         The Yocto Project also features the Sato reference User Interface, which is optimized for 
         stylus driven, low-resolution screens.
     </para>
@@ -37,7 +36,8 @@
         While the Yocto Project does not provide a strict testing framework,
         it does provide or generate for you artifacts that let you perform target-level and 
         emulated testing and debugging.  
-        And, if you are an Eclipse user, you can install an Eclipse Yocto Plug-in to allow you to 
+        And, if you are an <trademark class='trade'>Eclipse</trademark>
+        IDE user, you can install an Eclipse Yocto Plug-in to allow you to 
         develop within that familiar environment.
     </para>
 </section>
@@ -51,103 +51,100 @@
             <listitem><para><emphasis>Host System:</emphasis>  You should have a reasonably current 
                 Linux-based host system.
                 You will have the best results with a recent release of Fedora, 
-                OpenSUSE, or Ubuntu as these releases are frequently tested and officially supported 
-                host systems.  
+                OpenSUSE, or Ubuntu as these releases are frequently tested against the Yocto Project
+                and officially supported.  
                 You should also have about 100 gigabytes of free disk space for building images.
                 </para></listitem>
             <listitem><para><emphasis>Packages:</emphasis>  The Yocto Project requires certain packages
                 exist on your development system (e.g. Python 2.6 or 2.7).  
-                See <ulink url='http://www.yoctoproject.org/docs/yocto-quick-start/yocto-project-qs.html#packages'>
-                The Packages</ulink> section in the Yocto Project Quick start for the exact package 
-                requirements and the installation commands for the supported distributions.</para></listitem>
+                See "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#packages'>The Packages</ulink>" 
+                section in the Yocto Project Quick start for the exact package 
+                requirements and the installation commands to install them 
+                for the supported distributions.</para></listitem>
             <listitem id='local-yp-release'><para><emphasis>Yocto Project Release:</emphasis>  
                 You need a release of the Yocto Project.  
                 You can get set up with local Yocto Project files one of two ways depending on whether you 
                 are going to be contributing back into the Yocto Project source repository or not.
                 <note>
-                    Regardless of the method you use, this manual will refer to the resulting 
-                    hierarchical set of files as "the local Yocto Project files."
+                    Regardless of the method you use, this manual refers to the resulting 
+                    hierarchical set of files as "the Yocto Project files" or "the Yocto Project file
+                    structure."
                 </note>
                 <itemizedlist>
                     <listitem><para><emphasis>Tarball Extraction:</emphasis>  If you are not going to contribute 
-                        back into the Yocto Project you can simply download the Yocto Project release you want 
+                        back into the Yocto Project, you can simply download the Yocto Project release you want 
                         from the website’s <ulink url='http://yoctoproject.org/download'>download page</ulink>.
                         Once you have the tarball, just extract it into a directory of your choice.</para>
-
                         <para>For example, the following command extracts the Yocto Project 1.1 release tarball 
-                            into the current working directory and sets up a file structure whose top-level 
-                            directory is named <filename>poky-1.1</filename>:
-                            <literallayout class='monospaced'>
-     $ tar xfj poky-1.1.tar.bz2
-                            </literallayout></para>
-                        <para>This method does not produce a <filename>poky</filename> Git repository. 
-                            You end up simply with a local snapshot of Yocto Project files that are based on the 
-                            particular release in the tarball.</para></listitem>
+                        into the current working directory and sets up the Yocto Project file structure
+                        with a top-level directory named <filename>poky-1.1</filename>:
+                        <literallayout class='monospaced'>
+     $ tar xfj poky-edison-6.0.tar.bz2
+                        </literallayout></para>
+                        <para>This method does not produce a Git repository. 
+                        Instead, you simply end up with a local snapshot of the 
+                        Yocto Project files that are based on the particular release in the 
+                        tarball.</para></listitem>
                     <listitem><para><emphasis>Git Repository Method:</emphasis>  If you are going to be contributing
-                        back into the Yocto Project you should use Git commands to set up a local 
-                        <filename>poky</filename> Git repository of the Yocto Project.  
+                        back into the Yocto Project, you should use Git commands to set up a local 
+                        Git repository of the Yocto Project files.  
                         Doing so creates a Git repository with a complete history of changes and allows 
                         you to easily submit your changes upstream to the project.</para>
- 
-                       <para>The following transcript shows how to clone the <filename>poky</filename> 
+                       <para>The following transcript shows how to clone the Yocto Project files'  
                        Git repository into the current working directory.  
                        The command creates the repository in a directory named <filename>poky</filename>.
-                       For information on the Yocto Project and Git, see
-                       <xref linkend='git'>Git</xref> in  
-                       <xref linkend='dev-manual-newbie'>Working with Open Source Code</xref>.
+                       For information on the Yocto Project and Git, see the
+                       "<link linkend='git'>Git</link>" section.
                        <literallayout class='monospaced'>
      $ git clone git://git.yoctoproject.org/poky
      Initialized empty Git repository in /home/scottrif/poky/.git/
-     remote: Counting objects: 107624, done.
-     remote: Compressing objects: 100% (37128/37128), done.
-     remote: Total 107624 (delta 73393), reused 99851 (delta 67287)
-     Receiving objects: 100% (107624/107624), 69.74 MiB | 483 KiB/s, done.
-     Resolving deltas: 100% (73393/73393), done.
-                       </literallayout></para>
-
-                       <para>For another example of how to set up your own local Git repositories see this
+     remote: Counting objects: 116882, done.
+     remote: Compressing objects: 100% (35987/35987), done.
+     remote: Total 116882 (delta 80651), reused 113045 (delta 77578)
+     Receiving objects: 100% (116882/116882), 72.13 MiB | 2.68 MiB/s, done.
+     Resolving deltas: 100% (80651/80651), done.                       </literallayout></para>
+                       <para>For another example of how to set up your own local Git repositories, see this
                         <ulink url='https://wiki.yoctoproject.org/wiki/Transcript:_from_git_checkout_to_meta-intel_BSP'>
                         wiki page</ulink>, which describes how to create both <filename>poky</filename>
                         and <filename>meta-intel</filename> Git repositories.</para></listitem>
                 </itemizedlist></para></listitem>
             <listitem id='local-kernel-files'><para><emphasis>Linux Yocto Kernel:</emphasis>  
-                If you are going to be making modifications to a supported Linux Yocto kernel you 
-                need to get set up so that you can edit local copies of the source.
+                If you are going to be making modifications to a supported Linux Yocto kernel, you 
+                need to establish local copies of the source.
                 This setup involves creating a bare clone of the Linux Yocto kernel and then cloning 
                 that repository.
                 You can create the bare clone and the copy of the bare clone anywhere you like.
                 For simplicity, it is recommended that you create these structures outside of the 
-                Yocto Project files Git repository.</para>
+                Yocto Project files' Git repository.</para>
                 <para>As an example, the following transcript shows how to create the bare clone
                 of the <filename>linux-yocto-3.0</filename> kernel and then create a copy of 
                 that clone.
-                <note>If you currently have a local Linux Yocto kernel Git repository, you can 
-                reference this local repository rather than the upstream Git repository as 
+                <note>When you have a local Linux Yocto kernel Git repository, you can 
+                reference that repository rather than the upstream Git repository as 
                 part of the <filename>clone</filename> command.
                 Doing so can speed up the process.</note>
-                The bare clone is named <filename>linux-yocto-3.0.git</filename>, while the 
+                In the following example, the bare clone is named 
+                <filename>linux-yocto-3.0.git</filename>, while the 
                 copy is named <filename>linux-yocto-3.0</filename>: 
                 <literallayout class='monospaced'>
      $ git clone --bare git://git.yoctoproject.org/linux-yocto-3.0 linux-yocto-3.0.git
-     Initialized empty Git repository in /home/scottrif/poky/linux-yocto-3.0.git/
-     remote: Counting objects: 1886034, done.
-     remote: Compressing objects: 100% (314326/314326), done.
-     remote: Total 1886034 (delta 1570200), reused 1870337 (delta 1554798)
-     Receiving objects: 100% (1886034/1886034), 401.51 MiB | 3.27 MiB/s, done.
-     Resolving deltas: 100% (1570200/1570200), done.
-                </literallayout></para>
+     Initialized empty Git repository in /home/scottrif/linux-yocto-3.0.git/
+     remote: Counting objects: 2123870, done.
+     remote: Compressing objects: 100% (341338/341338), done.
+     remote: Total 2123870 (delta 1778780), reused 2107534 (delta 1762583)
+     Receiving objects: 100% (2123870/2123870), 445.72 MiB | 2.06 MiB/s, done.
+     Resolving deltas: 100% (1778780/1778780), done.                </literallayout></para>
                 <para>Now create a clone of the bare clone just created:
                 <literallayout class='monospaced'>
      $ git clone linux-yocto-3.0.git linux-yocto-3.0
-     Initialized empty Git repository in /home/scottrif/poky/linux-yocto-3.0/.git/
-     Checking out files: 100% (35188/35188), done.
-                </literallayout></para></listitem>
+     Initialized empty Git repository in /home/scottrif/linux-yocto-3.0/.git/
+     Checking out files: 100% (36898/36898), done.                </literallayout></para></listitem>
             <listitem id='poky-extras-repo'><para><emphasis>
                 The <filename>poky-extras</filename> Git Repository</emphasis>:
                 The <filename>poky-extras</filename> Git repository contains metadata needed to 
                 build the kernel image.
                 In particular, it contains the kernel <filename>.bbappend</filename> files that you 
-                edit to point to your locally modified kernel source files and to build kernel
+                edit to point to your locally modified kernel source files and to build the kernel
                 image. 
                 Pointing to these local files is much more efficient than requiring a download of the 
                 source files from upstream each time you make changes to the kernel.</para>
@@ -160,14 +157,13 @@
      $ cd ~/poky
      $ git clone git://git.yoctoproject.org/poky-extras poky-extras
      Initialized empty Git repository in /home/scottrif/poky/poky-extras/.git/
-     remote: Counting objects: 531, done.
-     remote: Compressing objects: 100% (471/471), done.
-     remote: Total 531 (delta 138), reused 307 (delta 39)
-     Receiving objects: 100% (531/531), 517.86 KiB, done.
-     Resolving deltas: 100% (138/138), done.
-                </literallayout></para></listitem>
-           <listitem><para><emphasis>Supported Board Support Packages (BSPs):</emphasis>  The same considerations 
-                exist for BSPs.  
+     remote: Counting objects: 543, done.
+     remote: Compressing objects: 100% (483/483), done.
+     remote: Total 543 (delta 144), reused 307 (delta 39)
+     Receiving objects: 100% (543/543), 520.55 KiB, done.
+     Resolving deltas: 100% (144/144), done.                </literallayout></para></listitem>
+           <listitem><para><emphasis>Supported Board Support Packages (BSPs):</emphasis>  
+                Similar considerations exist for BSPs.  
                 You can get set up for BSP development one of two ways: tarball extraction or
                 with a local Git repository.
                 Regardless of the method you use, the Yocto Project uses the following BSP layer 
@@ -185,16 +181,16 @@
                 <itemizedlist>
                     <listitem><para><emphasis>Tarball Extraction:</emphasis>  You can download any released 
                         BSP tarball from the same 
-                        <ulink url='http://yoctoproject.org/download'>download site</ulink>.  
-                        Once you have the tarball just extract it into a directory of your choice.
+                        <ulink url='http://yoctoproject.org/download'>download site</ulink> used 
+                        to get the Yocto Project release.  
+                        Once you have the tarball, just extract it into a directory of your choice.
                         Again, this method just produces a snapshot of the BSP layer in the form
                         of a hierarchical directory structure.</para></listitem>
                     <listitem><para><emphasis>Git Repository Method:</emphasis>  If you are working 
-                        with a <filename>poky</filename> Git repository you should also set up a 
+                        with a Yocto Project files Git repository, you should also set up a 
                         <filename>meta-intel</filename> Git repository.  
                         Typically, you set up the <filename>meta-intel</filename> Git repository inside
-                        the <filename>poky</filename> Git repository.</para>
-
+                        the Yocto Project files Git repository.</para>
                         <para>For example, the following transcript shows the steps to clone the 
                         <filename>meta-intel</filename>
                         Git repository inside the <filename>poky</filename> Git repository.
@@ -208,18 +204,17 @@
      Receiving objects: 100% (1325/1325), 1.56 MiB | 330 KiB/s, done.
      Resolving deltas: 100% (546/546), done.
                         </literallayout></para>
-
                         <para>The same  
                         <ulink url='https://wiki.yoctoproject.org/wiki/Transcript:_from_git_checkout_to_meta-intel_BSP'>
                         wiki page</ulink> referenced earlier covers how to 
                         set up the <filename>meta-intel</filename> Git repository.</para></listitem>
                 </itemizedlist></para></listitem>
             <listitem><para><emphasis>Eclipse Yocto Plug-in:</emphasis>  If you are developing 
-                applications using the 
-                Eclipse Integrated Development Environment (IDE) you will need this plug-in.  
+                applications using the Eclipse Integrated Development Environment (IDE),
+                you will need this plug-in.  
                 See the 
-                <ulink url='http://www.yoctoproject.org/docs/adt-manual/adt-manual.html#setting-up-the-eclipse-ide'>
-                Setting up the Eclipse IDE</ulink> section in the Yocto Application Development Toolkit (ADT) 
+                "<ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html#setting-up-the-eclipse-ide'>Setting up the Eclipse IDE</ulink>"
+                section in the Yocto Application Development Toolkit (ADT) 
                 User’s Guide for more information.</para></listitem>
         </itemizedlist>
     </para>
@@ -231,8 +226,8 @@
     <para>
         The build process creates an entire Linux distribution, including the toolchain, from source.  
         For more information on this topic, see the 
-        <ulink url='http://www.yoctoproject.org/docs/yocto-quick-start/yocto-project-qs.html#building-image'>
-        Building an Image</ulink> section in the Yocto Project Quick Start.
+        "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'>Building an Image</ulink>"
+        section in the Yocto Project Quick Start.
     </para>
 
     <para>
@@ -244,7 +239,7 @@
                 script.</para></listitem>
             <listitem><para>Optionally ensure the <filename>conf/local.conf</filename> configuration file is set 
                 up how you want it.  
-                This file defines the target machine architecture and and other build options.</para></listitem>
+                This file defines the target machine architecture and other build options.</para></listitem>
             <listitem><para>Build the image using the BitBake command.  
                 If you want information on Bitbake, see the user manual at 
                 <ulink url='http://docs.openembedded.org/bitbake/html'></ulink>.</para></listitem>
@@ -260,16 +255,17 @@
     <para>
         Another option you have to get started is to use pre-built binaries.  
         This scenario is ideal for developing software applications to run on your target hardware.  
-        To do this you need to install the stand-alone Yocto toolchain tarball and then download the 
-        pre-built kernel that you will boot using the QEMU emulator.  
-        Next, you must download the filesystem for your target machine’s architecture.  
-        Finally, you set up the environment to emulate the hardware then start the emulator.
+        To do this, you need to install the stand-alone Yocto Project cross-toolchain tarball and 
+        then download the pre-built kernel that you will boot in the QEMU emulator.  
+        Next, you must download and extract the target root filesystem for your target 
+        machine’s architecture.  
+        Finally, you set up the environment to emulate the hardware and then start the QEMU emulator.
     </para>
 
     <para>
         You can find details on all these steps in the 
-        <ulink url='http://www.yoctoproject.org/docs/yocto-quick-start/yocto-project-qs.html#using-pre-built'>
-        Using Pre-Built Binaries and QEMU</ulink> section in the Yocto Project Quick Start. 
+        "<ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#using-pre-built'>Using Pre-Built Binaries and QEMU</ulink>"
+        section of the Yocto Project Quick Start. 
     </para>
 </section>
 </chapter>

documentation/dev-manual/dev-manual.xml

@@ -30,9 +30,8 @@
         <revhistory>
             <revision>
                 <revnumber>1.1</revnumber>
-                <date>TBD 2011</date>
-                <revremark>This revision is the initial document draft and corresponds with 
-                    the Yocto Project 1.1 Release.</revremark>
+                <date>6 October 2011</date>
+                <revremark>The initial document released with the Yocto Project 1.1 Release.</revremark>
             </revision>
         </revhistory>
 

documentation/kernel-manual/kernel-concepts.xml

@@ -46,12 +46,14 @@
             the baseline kernel is the most stable official release.</para></listitem>
             <listitem><para>Include major technological features as part of Yocto Project's up-rev 
             strategy.</para></listitem>
-            <listitem><para>Present a Git tree, that just like the upstream kernel.org tree, has a 
-            clear and continuous history.</para></listitem>
+            <listitem><para>Present a kernel Git repository that, similar to the upstream 
+            <filename>kernel.org</filename> tree, 
+            has a clear and continuous history.</para></listitem>
             <listitem><para>Deliver a key set of supported kernel types, where each type is tailored 
-            to a specific use case (i.e. networking, consumer, devices, and so forth).</para></listitem>
-            <listitem><para>Employ a Git branching strategy that from a customer's point of view
-            results in a linear path from the baseline kernel.org, through a select group of features and
+            to a specific use case (e.g. networking, consumer, devices, and so forth).</para></listitem>
+            <listitem><para>Employ a Git branching strategy that, from a developer's point of view,
+            results in a linear path from the baseline <filename>kernel.org</filename>, 
+            through a select group of features and
             ends with their BSP-specific commits.</para></listitem>
         </itemizedlist>
         </para>
@@ -60,27 +62,29 @@
     <section id='kernel-big-picture'>
         <title>Yocto Project Kernel Development and Maintenance Overview</title>
         <para>
-            Yocto Project kernel, like other kernels, is based off the Linux kernel release
+            The Yocto Project kernel, like other kernels, is based off the Linux kernel release
             from <ulink url='http://www.kernel.org'></ulink>.  
-            At the beginning of our major development cycle, we choose our Yocto Project kernel 
-            based on factors like release timing, the anticipated release timing of "final" (i.e. non "rc")
-            upstream kernel.org versions, and Yocto Project feature requirements.
-            Typically this will be a kernel that is in the
-            final stages of development by the community (i.e. still in the release
-            candidate or "rc" phase) and not yet a final release. 
-            But by being in the final stages of external development, we know that the 
-            kernel.org final release will clearly land within the early stages of 
+            At the beginning of a major development cycle, the Yocto Project team
+            chooses its Yocto Project kernel 
+            based on factors like release timing, the anticipated release timing of final
+            upstream <filename>kernel.org</filename> versions, and Yocto Project feature requirements.
+            Typically, the kernel chosen is in the
+            final stages of development by the community.
+            In other words, the kernel is in the release
+            candidate or "rc" phase and not yet a final release. 
+            But, by being in the final stages of external development, the team knows that the 
+            <filename>kernel.org</filename> final release will clearly be within the early stages of 
             the Yocto Project development window.
         </para>
         <para>
-            This balance allows us to deliver the most up-to-date kernel
-            as possible, while still ensuring that we have a stable official release as
-            our baseline kernel version.
+            This balance allows the team to deliver the most up-to-date kernel
+            as possible, while still ensuring that the team has a stable official release as
+            the baseline kernel version.
         </para>
         <para>
             The ultimate source for the Yocto Project kernel is a released kernel 
-            from kernel.org.
-            In addition to a foundational kernel from kernel.org the released 
+            from <filename>kernel.org</filename>.
+            In addition to a foundational kernel from <filename>kernel.org</filename>, the released 
             Yocto Project kernel contains a mix of important new mainline
             developments, non-mainline developments (when there is no alternative),
             Board Support Package (BSP) developments,
@@ -88,37 +92,21 @@
             These additions result in a commercially released Yocto Project kernel that caters 
             to specific embedded designer needs for targeted hardware.
         </para>
-<!--        <para>
-            The following figure represents the overall place the Yocto Project kernel fills.
-        </para>
         <para>
-        <imagedata fileref="figures/kernel-big-picture.png" width="6in" depth="6in" align="center" scale="100" />
-        </para>
-        <para>
-            In the figure the ultimate source for the Yocto Project kernel is a released kernel 
-            from kernel.org.
-            In addition to a foundational kernel from kernel.org the commercially released 
-            Yocto Project kernel contains a mix of important new mainline
-            developments, non-mainline developments, Board Support Package (BSP) developments,
-            and custom features.
-            These additions result in a commercially released Yocto Project kernel that caters 
-            to specific embedded designer needs for targeted hardware. 
-        </para> -->
-        <para>
-            Once a Yocto Project kernel is officially released the Yocto Project team goes into 
-            their next development cycle, or "uprev" cycle while continuing maintenance on the 
+            Once a Yocto Project kernel is officially released, the Yocto Project team goes into 
+            their next development cycle, or "uprev" cycle, while still continuing maintenance on the 
             released kernel.
             It is important to note that the most sustainable and stable way
             to include feature development upstream is through a kernel uprev process.
-            Back-porting of hundreds of individual fixes and minor features from various
-            kernel versions is not sustainable and can easily compromise quality. 
+            Back-porting hundreds of individual fixes and minor features from various
+            kernel versions is not sustainable and can easily compromise quality.
+        </para>
+        <para> 
             During the uprev cycle, the Yocto Project team uses an ongoing analysis of
             kernel development, BSP support, and release timing to select the best
-            possible kernel.org version.
+            possible <filename>kernel.org</filename> version.
             The team continually monitors community kernel
             development to look for significant features of interest.
-<!--            The illustration depicts this by showing the team looking back to kernel.org for new features, 
-            BSP features, and significant bug fixes. -->
             The team does consider back-porting large features if they have a significant advantage. 
             User or community demand can also trigger a back-port or creation of new
             functionality in the Yocto Project baseline kernel during the uprev cycle. 
@@ -130,7 +118,7 @@
             It is the Yocto Project team's policy to not back-port minor features to the released kernel. 
             They only consider back-porting significant technological jumps - and, that is done 
             after a complete gap analysis. 
-            The reason for this policy is that simply back-porting any small to medium sized change 
+            The reason for this policy is that back-porting any small to medium sized change 
             from an evolving kernel can easily create mismatches, incompatibilities and very 
             subtle errors.
         </para>
@@ -163,18 +151,23 @@
                 As mentioned earlier, a key goal of Yocto Project is to present the developer with 
                 a kernel that has a clear and continuous history that is visible to the user. 
                 The architecture and mechanisms used achieve that goal in a manner similar to the 
-                upstream kernel.org.
-                
+                upstream <filename>kernel.org</filename>.
             </para>
             <para>
                 You can think of the Yocto Project kernel as consisting of a baseline kernel with
                 added features logically structured on top of the baseline.
                 The features are tagged and organized by way of a branching strategy implemented by the 
-                source code manager (SCM) Git. 
+                source code manager (SCM) Git.
+                For information on Git as applied to the Yocto Project, see the
+                "<ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#git'>Git</ulink>"
+                section in <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>The 
+                Yocto Project Development Manual</ulink>.
+            </para>
+            <para>
                 The result is that the user has the ability to see the added features and 
                 the commits that make up those features.
                 In addition to being able to see added features, the user can also view the history of what 
-                made up the baseline kernel as well.
+                made up the baseline kernel.
             </para>
             <para>
                 The following illustration shows the conceptual Yocto Project kernel.
@@ -183,18 +176,20 @@
                 <imagedata fileref="figures/kernel-architecture-overview.png" width="6in" depth="7in" align="center" scale="100" />
             </para>
             <para>
-                In the illustration, the "kernel.org Branch Point" marks the specific spot (or release) from 
-                which the Yocto Project kernel is created.  From this point "up" in the tree features and 
-                differences are organized and tagged.
+                In the illustration, the "<filename>kernel.org</filename> Branch Point" 
+                marks the specific spot (or release) from 
+                which the Yocto Project kernel is created.  
+                From this point "up" in the tree, features and differences are organized and tagged.
             </para>
             <para>
                 The "Yocto Project Baseline Kernel" contains functionality that is common to every kernel
-                type and BSP that is organized further up the tree.  Placing these common features in the 
+                type and BSP that is organized further up the tree.  
+                Placing these common features in the 
                 tree this way means features don't have to be duplicated along individual branches of the 
                 structure.
             </para>
             <para>
-                From the Yocto Project Baseline Kernel branch points represent specific functionality
+                From the Yocto Project Baseline Kernel, branch points represent specific functionality
                 for individual BSPs as well as real-time kernels.
                 The illustration represents this through three BSP-specific branches and a real-time 
                 kernel branch.  
@@ -209,8 +204,9 @@
                 kernel as they apply to a given BSP.
             </para>
             <para>
-                The resulting tree structure presents a clear path of markers (or branches) to the user
-                that for all practical purposes is the kernel needed for any given set of requirements.
+                The resulting tree structure presents a clear path of markers (or branches) to the 
+                developer that, for all practical purposes, is the kernel needed for any given set 
+                of requirements.
             </para>
         </section>
  
@@ -221,50 +217,52 @@
                 no longer shared and thus, needs to be isolated.
                 For example, board-specific incompatibilities would require different functionality
                 and would require a branch to separate the features. 
-                Likewise, for specific kernel features the same branching strategy is used.
+                Likewise, for specific kernel features, the same branching strategy is used.
+            </para>
+            <para>
                 This branching strategy results in a tree that has features organized to be specific 
                 for particular functionality, single kernel types, or a subset of kernel types.  
-                This strategy results in not having to store the same feature twice internally in the 
-                tree.
-                Rather we store the unique differences required to apply the feature onto the kernel type 
-                in question.
+                This strategy also results in not having to store the same feature twice 
+                internally in the tree.
+                Rather, the kernel team stores the unique differences required to apply the 
+                feature onto the kernel type in question.
+                <note>
+                    The Yocto Project team strives to place features in the tree such that they can be 
+                    shared by all boards and kernel types where possible.
+                    However, during development cycles or when large features are merged,
+                    the team cannot always follow this practice. 
+                    In those cases, the team uses isolated branches to merge features.
+                </note>
             </para>
-            <note><para>
-                The Yocto Project team strives to place features in the tree such that they can be 
-                shared by all boards and kernel types where possible.
-                However, during development cycles or when large features are merged this practice 
-                cannot always be followed. 
-                In those cases isolated branches are used for feature merging.
-            </para></note>
             <para>
                 BSP-specific code additions are handled in a similar manner to kernel-specific additions. 
                 Some BSPs only make sense given certain kernel types.
-                So, for these types, we create branches off the end of that kernel type for all 
+                So, for these types, the team creates branches off the end of that kernel type for all 
                 of the BSPs that are supported on that kernel type.  
                 From the perspective of the tools that create the BSP branch, the BSP is really no 
                 different than a feature.
                 Consequently, the same branching strategy applies to BSPs as it does to features.
-                So again, rather than store the BSP twice, only the unique differences for the BSP across
-                the supported multiple kernels are uniquely stored.
+                So again, rather than store the BSP twice, the team only stores the unique 
+                differences for the BSP across the supported multiple kernels.
             </para>
             <para>
                 While this strategy can result in a tree with a significant number of branches, it is
-                important to realize that from the user's point of view, there is a linear
-                path that travels from the baseline kernel.org, through a select group of features and
-                ends with their BSP-specific commits.
+                important to realize that from the developer's point of view, there is a linear
+                path that travels from the baseline <filename>kernel.org</filename>, through a select
+                group of features and ends with their BSP-specific commits.
                 In other words, the divisions of the kernel are transparent and are not relevant 
                 to the developer on a day-to-day basis.  
-                From the user's perspective, this is the "master" branch.
-                They do not need not be aware of the existence of any other branches at all.  
-                Of course there is value in the existence of these branches
+                From the developer's perspective, this path is the "master" branch.
+                The developer does not need not be aware of the existence of any other branches at all.  
+                Of course, there is value in the existence of these branches
                 in the tree, should a person decide to explore them. 
                 For example, a comparison between two BSPs at either the commit level or at the line-by-line 
-                code diff level is now a trivial operation.
+                code <filename>diff</filename> level is now a trivial operation.
             </para>
             <para>
                 Working with the kernel as a structured tree follows recognized community best practices. 
-                In particular, the kernel as shipped with the product should be
-                considered an 'upstream source' and viewed as a series of
+                In particular, the kernel as shipped with the product, should be
+                considered an "upstream source" and viewed as a series of
                 historical and documented modifications (commits). 
                 These modifications represent the development and stabilization done
                 by the Yocto Project kernel development team.
@@ -273,7 +271,7 @@
                 Because commits only change at significant release points in the product life cycle,
                 developers can work on a branch created
                 from the last relevant commit in the shipped Yocto Project kernel. 
-                As mentioned previously, the structure is transparent to the user
+                As mentioned previously, the structure is transparent to the developer
                 because the kernel tree is left in this state after cloning and building the kernel.
             </para>
         </section>
@@ -281,20 +279,26 @@
         <section id='source-code-manager-git'>
             <title>Source Code Manager - Git</title>
             <para>
-                The Source Code Manager (SCM) is Git and it is the obvious mechanism for meeting the 
-                previously mentioned goals.  
-                Not only is it the SCM for kernel.org but Git continues to grow in popularity and
-                supports many different work flows, front-ends and management techniques.
+                The Source Code Manager (SCM) is Git.
+                This SCM is the obvious mechanism for meeting the previously mentioned goals.  
+                Not only is it the SCM for <filename>kernel.org</filename> but,
+                Git continues to grow in popularity and supports many different work flows, 
+                front-ends and management techniques.
             </para>
             <para>
                 You can find documentation on Git at <ulink url='http://git-scm.com/documentation'></ulink>.
-                Also, the Yocto Project Development manual has an introduction to Git and describes a 
-                minimal set of commands that allow you to be functional with Git.
+                You can also get an introduction to Git as it applies to the Yocto Project in the
+                "<ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#git'>Git</ulink>"
+                section in <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>The 
+                Yocto Project Development Manual</ulink>. 
+                This section overviews Git and describes a minimal set of commands that allow you to be 
+                functional using Git.
+                <note>
+                    You can use as much, or as little, of what Git has to offer to accomplish what
+                    you need for your project.
+                    You do not have to be a "Git Master" in order to use it with the Yocto Project.
+                </note>
             </para>
-            <note><para> 
-                It should be noted that you can use as much, or as little, of what Git has to offer 
-                as is appropriate to your project.
-            </para></note>
         </section>
     </section>
 
@@ -307,17 +311,19 @@
             present a simplified view of the kernel for ease of use.
         </para>
         <para>
-            The fundamental properties of the tools that manage and construct the
-            Yocto Project kernel are:
+            Fundamentally, the kernel tools that manage and construct the
+            Yocto Project kernel accomplish the following:
             <itemizedlist>
                 <listitem><para>Group patches into named, reusable features.</para></listitem>
-                <listitem><para>Allow top down control of included features.</para></listitem>
-                <listitem><para>Bind kernel configuration to kernel patches and features.</para></listitem>
+                <listitem><para>Allow top-down control of included features.</para></listitem>
+                <listitem><para>Bind kernel configurations to kernel patches and features.</para></listitem>
                 <listitem><para>Present a seamless Git repository that blends Yocto Project value 
-                    with the kernel.org history and development.</para></listitem>
+                    with the <filename>kernel.org</filename> history and development.</para></listitem>
             </itemizedlist>
         </para>
 <!--<para>
+WRITER NOTE: Put this in for post 1.1 if possible:
+
 The tools that construct a kernel tree will be discussed later in this 
 document. The following tools form the foundation of the Yocto Project 
 kernel toolkit:

documentation/kernel-manual/kernel-doc-intro.xml

@@ -20,17 +20,20 @@
         on its history, organization, benefits, and use.
         The manual consists of two sections:
         <itemizedlist>
-            <listitem><para>Concepts - Describes concepts behind the kernel.
+            <listitem><para><emphasis>Concepts:</emphasis> Describes concepts behind the kernel.
                 You will understand how the kernel is organized and why it is organized in 
                 the way it is.  You will understand the benefits of the kernel's organization 
                 and the mechanisms used to work with the kernel and how to apply it in your 
                 design process.</para></listitem>
-            <listitem><para>Using the Kernel - Describes best practices and "how-to" information
-                that lets you put the kernel to practical use.  Some examples are "How to Build a 
-                Project Specific Tree", "How to Examine Changes in a Branch", and "Saving Kernel
-                Modifications."</para></listitem>
+            <listitem><para><emphasis>Using the Kernel:</emphasis> Describes best practices 
+                and "how-to" information
+                that lets you put the kernel to practical use.  
+                Some examples are "How to Build a 
+                Project Specific Tree", "How to Examine Changes in a Branch", and "How to 
+                Save Kernel Modifications."</para></listitem>
         </itemizedlist>
     </para>
+
     <para>
         For more information on the kernel, see the following links:
         <itemizedlist>
@@ -38,10 +41,19 @@
             <listitem><para><ulink url='http://userweb.kernel.org/~akpm/stuff/tpp.txt'></ulink></para></listitem>
             <listitem><para><ulink url='http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/HOWTO;hb=HEAD'></ulink></para></listitem> 
         </itemizedlist>
-        <para> 
-        You can find more information on Yocto Project by visiting the website at
+    </para>
+
+    <para>
+        For more discussion on the Yocto Project kernel, you can also see the
+        "<ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#kernel-overview'>Kernel Overview</ulink>",
+        "<ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#kernel-modification-workflow'>Kernel Modification Workflow</ulink>", and 
+        "<ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#dev-manual-kernel-appendix'>Kernel Modification Example</ulink>" sections all in
+        <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>The Yocto Project Development Manual</ulink>.
+    </para>
+
+    <para> 
+        For general information on the Yocto Project, visit the website at
         <ulink url='http://www.yoctoproject.org'></ulink>.
-        </para>
     </para>
 </section>
 

documentation/kernel-manual/kernel-manual.xml

@@ -31,18 +31,22 @@
             <revision>
                 <revnumber>0.9</revnumber>
                 <date>24 November 2010</date>
-                <revremark>This revision is the initial document draft and corresponds with 
-                    the Yocto Project 0.9 Release.</revremark>
+                <revremark>The initial document draft released with the Yocto Project 0.9 Release.</revremark>
             </revision>
             <revision>
                 <revnumber>1.0</revnumber>
                 <date>6 April 2011</date>
-                <revremark>This revision corresponds with the Yocto Project 1.0 Release.</revremark>
+                <revremark>Released with the Yocto Project 1.0 Release.</revremark>
             </revision>
             <revision>
                 <revnumber>1.0.1</revnumber>
                 <date>23 May 2011</date>
-                <revremark>Released with Yocto Project 1.0.1 on 23 May 2011.</revremark>
+                <revremark>Released with the Yocto Project 1.0.1 Release.</revremark>
+            </revision>
+            <revision>
+                <revnumber>1.1</revnumber>
+                <date>6 October 2011</date>
+                <revremark>Released with the Yocto Project 1.1 Release.</revremark>
             </revision>
         </revhistory>
 

documentation/poky-ref-manual/development.xml

@@ -91,9 +91,9 @@
             with other plug-ins installed into the Eclipse IDE.
             Once you have your environment setup you need to configure the Eclipse plug-in.
             For information on how to install and configure the Eclipse plug-in, see the
-            <ulink url='http://www.yoctoproject.org/docs/adt-manual/adt-manual.html#adt-eclipse'>
+            <ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html#adt-eclipse'>
             "Working Within Eclipse"</ulink> chapter in the 
-            <ulink url='http://www.yoctoproject.org/docs/adt-manual/adt-manual.html'>
+            <ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html'>
             "Application Development Toolkit (ADT) User's Guide."</ulink>
          </para>
          </section>
@@ -102,7 +102,7 @@
         <title>External Development Using the QEMU Emulator</title>
         <para>
             Running Poky QEMU images is covered in the 
-            <ulink url="http://www.yoctoproject.org/docs/yocto-quick-start/yocto-project-qs.html">
+            <ulink url="http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html">
             Yocto Project Quick Start</ulink> in the "A Quick Test Run" section.
         </para>
         <para>

documentation/poky-ref-manual/extendpoky.xml

@@ -79,7 +79,8 @@
                 By default, the <filename>helloworld</filename>, <filename>helloworld-dbg</filename>,
                 and <filename>helloworld-dev</filename> packages are built. 
                 For information on how to customize the packaging process, see the
-                <link linkend='usingpoky-extend-addpkg-files'>Controlling Package Content</link> section.
+                "<link linkend='splitting-an-application-into-multiple-packages'>Splitting an Application
+                into Multiple Packages</link>" section.
             </para>
         </section>
 
@@ -174,8 +175,8 @@
             </para>
         </section>
 
-        <section id='usingpoky-extend-addpkg-files'>
-            <title>Controlling Package Content</title>
+        <section id='splitting-an-application-into-multiple-packages'>
+            <title>Splitting an Application into Multiple Packages</title>
 
             <para>                        
                 You can use the variables <filename><link linkend='var-PACKAGES'>PACKAGES</link></filename> and 
@@ -222,6 +223,59 @@
             </para>
         </section>
 
+        <section id='including-static-library-files'>
+            <title>Including Static Library Files</title>
+
+            <para>                        
+                If you are building a library and the library offers static linking, you can control
+                which static library files (<filename>*.a</filename> files) get included in the 
+                built library.  
+            </para>
+
+            <para>
+                The <filename>PACKAGES</filename> and <filename>FILES_*</filename> variables in the 
+                <filename>meta/conf/bitbake.conf</filename> configuration file define how files installed
+                by the <filename>do_install</filename> task are packaged.
+                By default, the <filename>PACKAGES</filename> variable contains 
+                <filename>${PN}-staticdev</filename>, which includes all static library files.
+                <note>
+                    Previously released versions of the Yocto Project defined the static library files 
+                    through <filename>${PN}-dev</filename>.
+                </note>
+                Following, is part of the BitBake configuration file. 
+                You can see where the static library files are defined:
+                <literallayout class='monospaced'>
+     PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-locale"
+     PACKAGES_DYNAMIC = "${PN}-locale-*"
+     FILES = ""
+
+     FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
+                 ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+                 ${base_bindir}/* ${base_sbindir}/* \
+                 ${base_libdir}/*${SOLIBS} \
+                 ${datadir}/${BPN} ${libdir}/${BPN}/* \
+                 ${datadir}/pixmaps ${datadir}/applications \
+                 ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
+                 ${libdir}/bonobo/servers"
+
+     FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
+                 ${datadir}/gnome/help"
+     SECTION_${PN}-doc = "doc"
+     
+     FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
+                     ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
+                     ${datadir}/aclocal ${base_libdir}/*.o"
+     SECTION_${PN}-dev = "devel"
+     ALLOW_EMPTY_${PN}-dev = "1"
+     RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})"
+     
+     FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a"
+     SECTION_${PN}-staticdev = "devel"
+     RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})"
+                </literallayout>
+            </para>
+        </section>
+
         <section id='usingpoky-extend-addpkg-postinstalls'>
             <title>Post Install Scripts</title>
 
@@ -303,7 +357,7 @@
                 It is important to use the correct names of packages in the 
                 <filename><link linkend='var-IMAGE_INSTALL'>IMAGE_INSTALL</link></filename> variable. 
                 You must use the OpenEmbedded notation and not the Debian notation for the names 
-                (e.g. <filename>glibc-dev</filename> instead of <filename>libc6-dev</filename>).
+                (e.g. <filename>eglibc-dev</filename> instead of <filename>libc6-dev</filename>).
             </para>
 
             <para>
@@ -470,7 +524,7 @@
             The information covers adding machines similar to those the Yocto Project already supports. 
             Although well within the capabilities of the Yocto Project, adding a totally new architecture 
             might require 
-            changes to <filename>gcc/glibc</filename> and to the site information, which is 
+            changes to <filename>gcc/eglibc</filename> and to the site information, which is 
             beyond the scope of this manual.
         </para>
 
@@ -860,7 +914,7 @@
                 Experience shows that buildbot is a good fit for this role. 
                 What works well is to configure buildbot to make two types of builds:
                 incremental and full (from scratch).  
-                See <ulink url='http://autobuilder.yoctoproject.org:8010'>the buildbot for the 
+                See <ulink url='http://www.yoctoproject.org:8010'>the buildbot for the 
                 Yocto Project</ulink> for an example implementation that uses buildbot.
             </para>
 
@@ -1018,6 +1072,170 @@
         </para>
     </section>
 
+    <section id="building-multiple-architecture-libraries-into-one-image">
+        <title>Combining Multiple versions of Library Files into One Image</title>
+
+        <para>
+            The build system offers the ability to build libraries with different
+            target optimizations or architecture formats and combine these together
+            into one system image. 
+            You can link different binaries in the image 
+            against the different libraries as needed for specific use cases.
+            This feature is called "Multilib."
+        </para>
+
+        <para>
+            An example would be where you have most of a system compiled in 32-bit
+            mode using 32-bit libraries, but you have something large, like a database
+            engine, that needs to be a 64-bit application and use 64-bit libraries.
+            Multilib allows you to get the best of both 32-bit and 64-bit libraries.
+        </para>
+
+        <para>
+            While the Multilib feature is most commonly used for 32 and 64-bit differences,
+            the approach the build system uses facilitates different target optimizations. 
+            You could compile some binaries to use one set of libraries and other binaries
+            to use other different sets of libraries.
+            The libraries could differ in architecture, compiler options, or other 
+            optimizations.
+        </para>
+
+        <para>
+            This section overviews the Multilib process only. 
+            For more details on how to implement Multilib, see the 
+            <ulink url='https://wiki.yoctoproject.org/wiki/Multilib'>Multilib</ulink> wiki 
+            page.
+        </para>
+
+        <section id='preparing-to-use-multilib'>
+            <title>Preparing to use Multilib</title>
+
+            <para>
+                User-specific requirements drive the Multilib feature,
+                Consequently, there is no one "out-of-the-box" configuration that likely
+                exists to meet your needs.
+            </para>
+
+            <para>
+                In order to enable Multilib, you first need to ensure your recipe is
+                extended to support multiple libraries. 
+                Many standard recipes are already extended and support multiple libraries.
+                You can check in the <filename>meta/conf/multilib.conf</filename>
+                configuration file in the Yocto Project files directory to see how this is 
+                done using the <filename>BBCLASSEXTEND</filename> variable.
+                Eventually, all recipes will be covered and this list will be unneeded.
+            </para>
+  
+            <para>
+                For the most part, the Multilib class extension works automatically to
+                extend the package name from <filename>${PN}</filename> to
+                <filename>${MLPREFIX}${PN}</filename>, where <filename>MLPREFIX</filename>
+                is the particular multilib (e.g. "lib32-" or "lib64-"). 
+                Standard variables such as <filename>DEPENDS</filename>, 
+                <filename>RDEPENDS</filename>, <filename>RPROVIDES</filename>, 
+                <filename>RRECOMMENDS</filename>, <filename>PACKAGES</filename>, and 
+                <filename>PACKAGES_DYNAMIC</filename> are automatically extended by the system.
+                If you are extending any manual code in the recipe, you can use the 
+                <filename>${MLPREFIX}</filename> variable to ensure those names are extended 
+                correctly. 
+                This automatic extension code resides in <filename>multilib.bbclass</filename>.
+            </para>
+        </section>
+
+        <section id='using-multilib'>
+            <title>Using Multilib</title>
+
+            <para>
+                After you have set up the recipes, you need to define the actual
+                combination of multiple libraries you want to build. 
+                You accomplish this through your <filename>local.conf</filename>
+                configuration file in the Yocto Project build directory. 
+                An example configuration would be as follows:
+                <literallayout class='monospaced'>
+     MACHINE = "qemux86-64"
+     require conf/multilib.conf
+     MULTILIBS = "multilib:lib32"
+     DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
+     MULTILIB_IMAGE_INSTALL = "lib32-connman"
+                </literallayout>
+                This example enables an
+                additional library named <filename>lib32</filename> alongside the 
+                normal target packages.
+                When combining these "lib32" alternatives, the example uses "x86" for tuning.
+                For information on this particular tuning, see
+                <filename>meta/conf/machine/include/ia32/arch-ia32.inc</filename>.
+            </para>
+
+            <para>
+                The example then includes <filename>lib32-connman</filename>
+                in all the images, which illustrates one method of including a 
+                multiple library dependency. 
+                You can use a normal image build to include this dependency,
+                for example:
+                <literallayout class='monospaced'>
+     $ bitbake core-image-sato
+                </literallayout>
+                You can also build Multilib packages specifically with a command like this:
+                <literallayout class='monospaced'>
+     $  bitbake lib32-connman
+                </literallayout>
+            </para>
+        </section>
+
+        <section id='additional-implementation-details'>
+            <title>Additional Implementation Details</title>
+
+            <para>
+                Different packaging systems have different levels of native Multilib
+                support. 
+                For the RPM Package Management System, the following implementation details 
+                exist:
+                <itemizedlist>
+                    <listitem><para>A unique architecture is defined for the Multilib packages,
+                        along with creating a unique deploy folder under 
+                        <filename>tmp/deploy/rpm</filename> in the Yocto
+                        Project build directory. 
+                        For example, consider <filename>lib32</filename> in a 
+                        <filename>qemux86-64</filename> image. 
+                        The possible architectures in the system are "all", "qemux86_64",
+                        "lib32_qemux86_64", and "lib32_x86".</para></listitem>
+                    <listitem><para>The <filename>${MLPREFIX}</filename> variable is stripped from 
+                        <filename>${PN}</filename> during RPM packaging.
+                        The naming for a normal RPM package and a Multilib RPM package in a
+                        <filename>qemux86-64</filename> system resolves to something similar to
+                        <filename>bash-4.1-r2.x86_64.rpm</filename> and 
+                        <filename>bash-4.1.r2.lib32_x86.rpm</filename>, respectively.
+                        </para></listitem>
+                    <listitem><para>When installing a Multilib image, the RPM backend first 
+                        installs the base image and then installs the Multilib libraries.
+                        </para></listitem>
+                    <listitem><para>The build system relies on RPM to resolve the identical files in the 
+                        two (or more) Multilib packages.</para></listitem>
+                </itemizedlist>
+            </para>
+
+            <para>
+                For the IPK Package Management System, the following implementation details exist:
+                <itemizedlist>
+                    <listitem><para>The <filename>${MLPREFIX}</filename> is not stripped from 
+                        <filename>${PN}</filename> during IPK packaging.
+                        The naming for a normal RPM package and a Multilib IPK package in a
+                        <filename>qemux86-64</filename> system resolves to something like 
+                        <filename>bash_4.1-r2.x86_64.ipk</filename> and
+                        <filename>lib32-bash_4.1-rw_x86.ipk</filename>, respectively.
+                        </para></listitem>
+                    <listitem><para>The IPK deploy folder is not modified with 
+                        <filename>${MLPREFIX}</filename> because packages with and without 
+                        the Multilib feature can exist in the same folder due to the 
+                        <filename>${PN}</filename> differences.</para></listitem>
+                    <listitem><para>IPK defines a sanity check for Multilib installation 
+                        using certain rules for file comparison, overridden, etc.
+                        </para></listitem>
+                </itemizedlist>
+            </para>
+        </section> 
+    </section>
+
     <section id="usingpoky-configuring-LIC_FILES_CHKSUM">
         <title>Tracking License Changes</title>
 

documentation/poky-ref-manual/faq.xml

@@ -14,7 +14,7 @@
             <para>
                 Poky is the Yocto Project build system that was derived from <ulink 
                 url='http://www.openembedded.org/'>OpenEmbedded</ulink>.
-                Poky is a stable, smaller subset focused on the GNOME Mobile environment. 
+                Poky is a stable, smaller subset focused on the mobile environment. 
                 Development in the Yocto Project using Poky is closely tied to OpenEmbedded with 
                 features being merged regularly between the two for mutual benefit.
             </para>
@@ -33,8 +33,8 @@
                 You can use a stand-alone tarball to provide Python 2.6.
                 You can find pre-built 32 and 64-bit versions of Python 2.6 at the following locations:
                 <itemizedlist>
-                    <listitem><para><ulink url='http://autobuilder.yoctoproject.org/downloads/miscsupport/yocto-1.0-python-nativesdk/python-nativesdk-standalone-i686.tar.bz2'>32-bit tarball</ulink></para></listitem>
-                    <listitem><para><ulink url='http://autobuilder.yoctoproject.org/downloads/miscsupport/yocto-1.0-python-nativesdk/python-nativesdk-standalone-x86_64.tar.bz2'>64-bit tarball</ulink></para></listitem>
+                    <listitem><para><ulink url='http://www.yoctoproject.org/downloads/miscsupport/yocto-1.1-python-nativesdk/python-nativesdk-standalone-i686.tar.bz2'>32-bit tarball</ulink></para></listitem>
+                    <listitem><para><ulink url='http://www.yoctoproject.org/downloads/miscsupport/yocto-1.1-python-nativesdk/python-nativesdk-standalone-x86_64.tar.bz2'>64-bit tarball</ulink></para></listitem>
                 </itemizedlist>
             </para>
             <para>
@@ -237,7 +237,7 @@
         <question>
             <para>
                 I see lots of 404 responses for files on 
-                <filename>http://autobuilder.yoctoproject.org/sources/*</filename>. Is something wrong?
+                <filename>http://www.yoctoproject.org/sources/*</filename>. Is something wrong?
             </para>
         </question>
         <answer>
@@ -520,10 +520,10 @@
                 configuration file:
                 <literallayout class='monospaced'>
      PREMIRRORS_prepend = "\
-     git://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
-     ftp://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
-     http://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
-     https://.*/.* http://autobuilder.yoctoproject.org/sources/ \n"
+     git://.*/.* http://www.yoctoproject.org/sources/ \n \
+     ftp://.*/.* http://www.yoctoproject.org/sources/ \n \
+     http://.*/.* http://www.yoctoproject.org/sources/ \n \
+     https://.*/.* http://www.yoctoproject.org/sources/ \n"
                 </literallayout>
             </para>
             <para>
@@ -564,9 +564,9 @@
                  configuration file as long as the PREMIRROR server is up to date:
                  <literallayout class='monospaced'>
      PREMIRRORS_prepend = "\
-     ftp://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
-     http://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
-     https://.*/.* http://autobuilder.yoctoproject.org/sources/ \n"
+     ftp://.*/.* http://www.yoctoproject.org/sources/ \n \
+     http://.*/.* http://www.yoctoproject.org/sources/ \n \
+     https://.*/.* http://www.yoctoproject.org/sources/ \n"
      BB_FETCH_PREMIRRORONLY = "1" 
                  </literallayout>
                  These changes would cause Poky to successfully fetch source over HTTP and 

documentation/poky-ref-manual/introduction.xml

@@ -106,7 +106,7 @@
             <listitem><para><emphasis>Releases:</emphasis> Stable, tested releases are available through 
                 <ulink url='http://yoctoproject.org/downloads/poky/'/>.</para></listitem>
             <listitem><para><emphasis>Nightly Builds:</emphasis> These releases are available at
-                <ulink url='http://autobuilder.yoctoproject.org/'/>.  
+                <ulink url='http://autobuilder.yoctoproject.org/nightly'/>.  
                 These builds include Yocto Project releases, meta-toolchain tarballs, and 
                 experimental builds.</para></listitem>
             <listitem><para><emphasis>Yocto Project Website:</emphasis> You can find releases

documentation/poky-ref-manual/poky-ref-manual.xml

@@ -26,7 +26,7 @@
                 <email>richard.purdie@linuxfoundation.org</email>
             </author>
 
-            <author>
+<!--            <author>
                 <firstname>Tomas</firstname> <surname>Frydrych</surname>
                 <affiliation>
                     <orgname>Intel Corporation</orgname>
@@ -38,24 +38,29 @@
             </author>
             <author>
                 <firstname>Dodji</firstname> <surname>Seketeli</surname>
-            </author>
+            </author> -->
         </authorgroup>
 
         <revhistory>
             <revision>
                 <revnumber>4.0+git</revnumber>
                 <date>24 November 2010</date>
-                <revremark>Poky Master Documentation</revremark>
+                <revremark>Released with the Yocto Project 0.9 Release</revremark>
             </revision>
             <revision>
-                <revnumber>5.0+git</revnumber>
+                <revnumber>1.0</revnumber>
                 <date>6 April 2011</date>
-                <revremark>Released with Yocto Project 1.0 (Bernard 5.0).</revremark>
+                <revremark>Released with the Yocto Project 1.0 Release.</revremark>
             </revision>
             <revision>
                 <revnumber>1.0.1</revnumber>
                 <date>23 May 2011</date>
-                <revremark>Released with Yocto Project 1.0.1 on 23 May 2011.</revremark>
+                <revremark>Released with the Yocto Project 1.0.1 Release.</revremark>
+            </revision>
+            <revision>
+                <revnumber>1.1</revnumber>
+                <date>6 October 2011</date>
+                <revremark>Released with the Yocto Project 1.1 Release.</revremark>
             </revision>
         </revhistory>
 

documentation/poky-ref-manual/ref-bitbake.xml

@@ -122,7 +122,7 @@
             <filename>task-base.bb</filename>,  
             which in turn leads to packages like <filename>Contacts</filename>, 
             <filename>Dates</filename> and <filename>BusyBox</filename>.
-            These packages in turn depend on glibc and the toolchain.
+            These packages in turn depend on <filename>eglibc</filename> and the toolchain.
         </para>
 
         <para>

documentation/poky-ref-manual/ref-classes.xml

@@ -152,8 +152,8 @@
 
     <para>
         This class renames packages so that they follow the Debian naming
-        policy (i.e. <filename>glibc</filename> becomes <filename>libc6</filename>
-        and <filename>glibc-devel</filename> becomes <filename>libc6-dev</filename>.
+        policy (i.e. <filename>eglibc</filename> becomes <filename>libc6</filename>
+        and <filename>eglibc-devel</filename> becomes <filename>libc6-dev</filename>.
     </para>
 </section>
 
@@ -387,8 +387,8 @@
     <para>
         This class adds a step to the package generation process that sanity checks the
         packages generated by the Yocto Project.
-        An ever-increasing range of checks are performed that check for 
-        common problems that break builds.
+        A range of checks are performed that check the build's output
+        for common problems that show up during runtime.
         Distribution policy usually dictates whether to include this class as the Yocto Project does.
     </para>
 </section>
@@ -403,7 +403,7 @@
         still make the correct values available.
         The <filename><link linkend='structure-meta-site'>meta/site directory</link></filename>
         contains test results sorted into different categories such as architecture, endianness, and
-        the libc used. 
+        the <filename>libc</filename> used. 
         Site information provides a list of files containing data relevant to 
         the current build in the 
         <filename><link linkend='var-CONFIG_SITE'>CONFIG_SITE</link></filename> variable 
@@ -422,6 +422,21 @@
     </para>
 </section>
 
+<section id='ref-classes-useradd'>
+    <title>Adding Users - <filename>useradd.bbclass</filename></title>
+
+    <para>
+        If you have packages that install files that are owned by custom users or groups, 
+        you can use this class to specify those packages and associate the users and groups
+        with those packages.
+        The <filename>meta-skeleton/recipes-skeleton/useradd/useradd-example.bb</filename> 
+        recipe in the Yocto Project Files provides a simple exmample that shows how to add three 
+        users and groups to two packages.
+        See the <filename>useradd-example.bb</filename> for more information on how to 
+        use this class.
+    </para>
+</section>
+
 <section id='ref-classes-others'>
     <title>Other Classes</title>
 
@@ -436,44 +451,71 @@
 </section>
 
 <!-- Undocumented classes are:
-        base_srpm.bbclass
+        allarch.bbclass
+        binconfig.bbclass
         bootimg.bbclass
+        buildstats.bbclass
         ccache.inc
-        ccdv.bbclass
         cmake.bbclass
         cml1.bbclass
         cross.bbclass
-        flow-lossage.bbclass
+        cross-canadian.bbclass
+        deploy.bbclass
+        distrodata.bbclass
         gconf.bbclass
         gettext.bbclass
         gnome.bbclass
+        gtk-doc.bbclass
         gtk-icon-cache.bbclass
         icecc.bbclass
+        image-mklibs.bbclass
+        image-prelink.bbclass
+        image-swab.bbclass
+        imagetest-dummy.bbclass
+        imagetest-qemu.bbclass
+        insserv.bbclass
         lib_package.bbclass
+        license.bbclass
+        logging.bbclass
+        meta.bbclass
+        metadata_scm.bbclass
         mirrors.bbclass
-        mozilla.bbclass
-        multimachine.bbclass
+        multilib*.bbclass
         native.bbclass
+        nativesdk.bbclass
         oelint.bbclass
+        own-mirrors.bbclass
+        packagedata.bbclass
+        packagehistory.bbclass
         patch.bbclass
-        patcher.bbclass
+        perlnative.bbclass
         pkg_distribute.bbclass
         pkg_metainfo.bbclass
-        poky.bbclass
+        populate_sdk*.bbclass
+        prserv.bbclass
+        python-dir.bbclass
+        qemu.bbclass
+        qmake*.bbclass
+        qt4*.bbclass
+        recipe_sanity.bbclass
+        relocatable.bbclass
         rm_work.bbclass
-        rpm_core.bbclass
         scons.bbclass
-        sdk.bbclass
         sdl.bbclass
+        setuptools.bbclass
         sip.bbclass
+        siteconfig.bbclass
         sourcepkg.bbclass
-        srec.bbclass
+        sstate.bbclass
+        staging.bbclass
         syslinux.bbclass
+        task.bbclass
+        terminal.bbclass
         tinderclient.bbclass
-        tmake.bbclass
+        toolchain-scripts.bbclass
+        typecheck.bbclass
+        utility-tasks.bbclass
         utils.bbclass
-        xfce.bbclass
-        xlibs.bbclass
 -->
 
 

documentation/poky-ref-manual/ref-variables.xml

@@ -16,7 +16,7 @@
 
     <para>
        <link linkend='var-AUTHOR'>A</link> 
-       <link linkend='var-BB_NUMBER_THREADS'>B</link> 
+       <link linkend='var-BAD_RECOMMENDATIONS'>B</link> 
        <link linkend='var-CFLAGS'>C</link> 
        <link linkend='var-D'>D</link> 
        <link linkend='var-ENABLE_BINARY_LOCALE_GENERATION'>E</link> 
@@ -25,7 +25,7 @@
        <link linkend='var-HOMEPAGE'>H</link> 
        <link linkend='var-IMAGE_FEATURES'>I</link> 
 <!--               <link linkend='var-glossary-j'>J</link> -->
-       <link linkend='var-KERNEL_IMAGETYPE'>K</link>
+       <link linkend='var-KERNEL_FEATURES'>K</link>
        <link linkend='var-LAYERDIR'>L</link> 
        <link linkend='var-MACHINE'>M</link> 
 <!--               <link linkend='var-glossary-n'>N</link> -->
@@ -64,6 +64,14 @@
 
     <glossdiv id='var-glossary-b'><title>B</title>
 
+        <glossentry id='var-BAD_RECOMMENDATIONS'><glossterm>BAD_RECOMMENDATIONS</glossterm>
+            <glossdef>
+                <para>A list of packages not to install despite being recommended by a recipe.
+                    Support for this variable exists only for images that use the 
+                    <filename>ipkg</filename> packaging system.</para>
+            </glossdef>
+        </glossentry>
+
         <glossentry id='var-BB_NUMBER_THREADS'><glossterm>BB_NUMBER_THREADS</glossterm>
             <glossdef>
                 <para>The maximum number of tasks BitBake should run in parallel at any one time.
@@ -320,7 +328,7 @@
 
         <glossentry id='var-ENABLE_BINARY_LOCALE_GENERATION'><glossterm>ENABLE_BINARY_LOCALE_GENERATION</glossterm>
             <glossdef>
-                <para>Variable that controls which locales for <filename>glibc</filename> are
+                <para>Variable that controls which locales for <filename>eglibc</filename> are
                     to be generated during the build (useful if the target device has 64Mbytes
                     of RAM or less).</para>
             </glossdef>
@@ -337,34 +345,36 @@
                     You can use this variable to add more features in addition to those.
                     Here are some examples of features you can add:</para>
                     <literallayout class='monospaced'>
-     "dbg-pkgs" - Adds -dbg packages for all installed packages
-                  including symbol information for debugging and 
-                  profiling.
+"dbg-pkgs" - Adds -dbg packages for all installed packages
+             including symbol information for debugging and 
+             profiling.
 
-     "dev-pkgs" - Adds -dev packages for all installed packages.  
-                  This is useful if you want to develop against 
-                  the libraries in the image.
+"dev-pkgs" - Adds -dev packages for all installed packages.  
+             This is useful if you want to develop against 
+             the libraries in the image.
 
-     "tools-sdk" - Adds development tools such as gcc, make, 
-                   pkgconfig and so forth.
+"tools-sdk" - Adds development tools such as gcc, make, 
+              pkgconfig and so forth.
 
-     "tools-debug" - Adds debugging tools such as gdb and 
-                     strace.
+"tools-debug" - Adds debugging tools such as gdb and 
+                strace.
 
-     "tools-profile" - Adds profiling tools such as oprofile, 
-                       exmap, lttng and valgrind (x86 only).
+"tools-profile" - Adds profiling tools such as oprofile, 
+                  exmap, lttng and valgrind (x86 only).
 
-     "tools-testapps" - Adds useful testing tools such as 
-                        ts_print, aplay, arecord and so 
-                        forth.
+"tools-testapps" - Adds useful testing tools such as 
+                   ts_print, aplay, arecord and so 
+                   forth.
 
-     "debug-tweaks" - Makes an image suitable for development.  
-                      For example, ssh root access has a blank 
-                      password.  There are other application 
-                      targets too, see 
-                      meta/classes/poky-image.bbclass
-                      and meta/packages/tasks/task-poky.bb 
-                      for more details.
+"debug-tweaks" - Makes an image suitable for development.  
+                 For example, ssh root access has a blank 
+                 password.  You should remove this feature 
+                 before you produce a production image.  
+                       
+                 There are other application targets too, see
+                 <filename>meta/classes/poky-image.bbclass</filename>
+                 and <filename>meta/packages/tasks/task-poky.bb</filename>
+                 for more details.
                     </literallayout> 
             </glossdef>
         </glossentry>
@@ -397,6 +407,37 @@
             </glossdef>
         </glossentry>
 
+        <glossentry id='var-FILESYSTEM_PERMS_TABLES'><glossterm>FILESYSTEM_PERMS_TABLES</glossterm>
+            <glossdef>
+                <para>Allows you to define your own file permissions settings table as part of
+                    your configuration for the packaging process.
+                    For example, suppose you need a consistent set of custom permissions for 
+                    a set of groups and users across an entire work project.
+                    It is best to do this in the packages themselves but this is not always 
+                    possible.
+                </para>
+                <para>
+                    By default, the Yocto Project uses the <filename>fs-perms.txt</filename>, which
+                    is located in the <filename>meta/files</filename> directory of the Yocto Project
+                    files directory.
+                    If you create your own file permissions setting table, you should place it in your
+                    layer or the distros layer. 
+                </para>
+                <para>
+                    You define the <filename>FILESYSTEM_PERMS_TABLES</filename> variable in the 
+                    <filename>conf/local.conf</filename> file, which is found in the Yocto Project's 
+                    build directory, to point to your custom <filename>fs-perms.txt</filename>.
+                    You can specify more than a single file permissions setting table.
+                    The paths you specify to these files must be defined within the 
+                    <filename>BBPATH</filename> variable.  
+                </para>
+                <para>
+                    For guidance on how to create your own file permissions settings table file, 
+                    examine the existing <filename>fs-perms.txt</filename>.
+                </para>
+            </glossdef>
+        </glossentry>
+
         <glossentry id='var-FULL_OPTIMIZATION'><glossterm>FULL_OPTIMIZATION</glossterm>
             <glossdef>
                 <para>
@@ -539,6 +580,34 @@
 
    <glossdiv id='var-glossary-k'><title>K</title>
 
+        <glossentry id='var-KERNEL_FEATURES'><glossterm>KERNEL_FEATURES</glossterm>
+            <glossdef>
+                <para>Includes additional metadata from the Linux Yocto kernel Git repository.
+                    In the Yocto Project build system, the default Board Support Packages (BSPs)
+                    metadata is provided through 
+                    the <filename>KMACHINE</filename> and <filename>KBRANCH</filename> variables.
+                    You can use the <filename>KERNEL_FEATURES</filename> variable to further 
+                    add metadata for all BSPs.</para>
+                <para>The metadata you add through this variable includes config fragments and 
+                    features descriptions,
+                    which usually includes patches as well as config fragments.
+                    You typically override the <filename>KERNEL_FEATURES</filename> variable
+                    for a specific machine.
+                    In this way, you can provide validated, but optional, sets of kernel
+                    configurations and features.</para>
+                <para>For example, the following adds <filename>netfilter</filename> to all 
+                    the Linux Yocto kernels and adds sound support to the <filename>qemux86</filename>
+                    machine:
+                    <literallayout class='monospaced'>
+     # Add netfilter to all linux-yocto kernels
+     KERNEL_FEATURES="features/netfilter"
+
+     # Add sound support to the qemux86 machine
+     KERNEL_FEATURES_append_qemux86="cfg/sound"
+                    </literallayout></para>
+            </glossdef>
+        </glossentry>
+
         <glossentry id='var-KERNEL_IMAGETYPE'><glossterm>KERNEL_IMAGETYPE</glossterm>
             <glossdef>
                 <para>The type of kernel to build for a device, usually set by the 
@@ -622,29 +691,152 @@
             </glossdef>
          </glossentry>
 
-         <glossentry id='var-MACHINE_ESSENTIAL_RDEPENDS'><glossterm>MACHINE_ESSENTIAL_RDEPENDS</glossterm>
+         <glossentry id='var-MACHINE_ESSENTIAL_EXTRA_RDEPENDS'><glossterm>MACHINE_ESSENTIAL_EXTRA_RDEPENDS</glossterm>
             <glossdef>
-                <para>Specifies the list of packages required to boot the device.</para>
+                <para>
+                    A list of required packages to install as part of the package being
+                    built.
+                    The build process depends on these packages being present.
+                    Furthermore, because this is a "machine essential" variable, the list of 
+                    packages are essential for the machine to boot.
+                    The impact of this variable affects images based on <filename>task-core-boot</filename>,
+                    including the <filename>core-image-minimal</filename> image.
+                </para>
+                <para>
+                    This variable is similar to the 
+                    <link linkend='var-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS'>MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS</link>
+                    variable with the exception that the package being built has a build 
+                    dependency on the variable's list of packages.
+                    In other words, the image will not build if a file in this list is not found.
+                </para>
+                <para>
+                    For example, suppose you are building a runtime package that depends
+                    on a certain disk driver.
+                    In this case, you would use the following:
+                    <literallayout class='monospaced'>
+     MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "&lt;disk_driver&gt;"
+                    </literallayout>
+                </para>
             </glossdef>
          </glossentry>
 
-         <glossentry id='var-MACHINE_ESSENTIAL_RRECOMMENDS'><glossterm>MACHINE_ESSENTIAL_RRECOMMENDS</glossterm>
+         <glossentry id='var-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS'><glossterm>MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS</glossterm>
             <glossdef>
-                <para>Specifies the list of packages required to boot the device (usually
-                    additional kernel modules).</para>
+                <para>
+                    A list of recommended packages to install as part of the package being 
+                    built. 
+                    The build process does not depend on these packages being present.
+                    Furthermore, because this is a "machine essential" variable, the list of 
+                    packages are essential for the machine to boot.
+                    The impact of this variable affects images based on <filename>task-core-boot</filename>,
+                    including the <filename>core-image-minimal</filename> image.
+                </para>
+                <para>
+                    This variable is similar to the 
+                    <link linkend='var-MACHINE_ESSENTIAL_EXTRA_RDEPENDS'>MACHINE_ESSENTIAL_EXTRA_RDEPENDS</link>
+                    variable with the exception that the package being built does not have a build 
+                    dependency on the variable's list of packages.
+                    In other words, the image will build if a file in this list is not found.
+                    However, because this is one of the "essential" variables, the resulting image
+                    might not boot on the machine. 
+                    Or, if the machine does boot using the image, the machine might not be fully 
+                    functional.
+                </para>
+                <para>
+                    Consider an example where you have a custom kernel with a disk driver
+                    built into the kernel itself, rather than using the driver built as a module.
+                    If you include the package that has the driver module as part of 
+                    the variable's list, the 
+                    build process will not find that package.  
+                    However, because these packages are "recommends" packages, the build will 
+                    not fail due to the missing package.
+                    Not accounting for any other problems, the custom kernel would still boot the machine.
+                </para>
+                <para>
+                    Some example packages of these machine essentials are flash, screen, keyboard, mouse, 
+                    or touchscreen drivers (depending on the machine).
+                </para>
+                <para>
+                    For example, suppose you are building a runtime package that depends
+                    on a mouse driver.
+                    In this case, you would use the following:
+                    <literallayout class='monospaced'>
+     MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "&lt;mouse_driver&gt;"
+                    </literallayout>
+                </para>
             </glossdef>
         </glossentry>
 
          <glossentry id='var-MACHINE_EXTRA_RDEPENDS'><glossterm>MACHINE_EXTRA_RDEPENDS</glossterm>
             <glossdef>
-                <para>Specifies the list of packages required to use the devices</para>
+                <para>
+                    A list of optional but non-machine essential packages to install as 
+                    part of the package being built.
+                    Even though these packages are not essential for the machine to boot,  
+                    the build process depends on them being present.
+                    The impact of this variable affects all images based on
+                    <filename>task-base</filename>, which does not include the 
+                    <filename>core-image-minimal</filename> or <filename>core-image-basic</filename> 
+                    images.
+                </para>
+                <para>
+                    This variable is similar to the 
+                    <link linkend='var-MACHINE_EXTRA_RRECOMMENDS'>MACHINE_EXTRA_RRECOMMENDS</link>
+                    variable with the exception that the package being built has a build 
+                    dependency on the variable's list of packages.
+                    In other words, the image will not build if a file in this list is not found.
+                </para>
+                <para>
+                    An example is a machine that might or might not have a WiFi card.
+                    The package containing the WiFi support is not essential for the 
+                    machine to boot the image.
+                    If it is not there, the machine will boot but not be able to use the 
+                    WiFi functionality.
+                    However, if you include the package with the WiFi support as part of the 
+                    variable's package list, the build 
+                    process depends on finding the package.
+                    In this case, you would use the following:
+                    <literallayout class='monospaced'>
+     MACHINE_EXTRA_RDEPENDS += "&lt;wifi_driver&gt;"
+                    </literallayout>
+                </para>
             </glossdef>
          </glossentry>
 
          <glossentry id='var-MACHINE_EXTRA_RRECOMMENDS'><glossterm>MACHINE_EXTRA_RRECOMMENDS</glossterm>
             <glossdef>
-                <para>Specifies the list of packages useful to use the device (e.g.
-                    additional kernel modules)</para>
+                <para>
+                    A list of optional but non-machine essential packages to install as 
+                    part of the package being built.
+                    The package being built has no build dependency on the list of packages 
+                    with this variable.  
+                    The impact of this variable affects only images based on 
+                    <filename>task-base</filename>, which does not include the 
+                    <filename>core-image-minimal</filename> or <filename>core-image-basic</filename> 
+                    images.
+                </para>
+                <para>
+                    This variable is similar to the 
+                    <link linkend='var-MACHINE_EXTRA_RDEPENDS'>MACHINE_EXTRA_RDEPENDS</link>
+                    variable with the exception that the package being built does not have a build 
+                    dependency on the variable's list of packages.
+                    In other words, the image will build if a file in this list is not found.
+                </para>
+                <para>
+                    An example is a machine that might or might not have a WiFi card.
+                    The package containing the WiFi support is not essential for the 
+                    machine to boot the image.
+                    If it is not there, the machine will boot but not be able to use the 
+                    WiFi functionality.
+                    You are free to either include or not include the 
+                    the package with the WiFi support as part of the 
+                    variable's package list, the build 
+                    process does not depend on finding the package.
+                    If you include the package, you would use the following:
+                    <literallayout class='monospaced'>
+     MACHINE_EXTRA_RRECOMMENDS += "&lt;wifi_driver&gt;"
+                    </literallayout>
+                </para>
             </glossdef>
          </glossentry>
 
@@ -781,10 +973,18 @@
 
         <glossentry id='var-PREFERRED_PROVIDER'><glossterm>PREFERRED_PROVIDER</glossterm>
             <glossdef>
-                <para>If multiple recipes provide an item, this variable
+                <para>
+                    If multiple recipes provide an item, this variable
                     determines which recipe should be given preference. 
-                    The variable should be set to the <filename>$PN</filename> of the recipe 
-                    to which you want to give precedence.</para>
+                    The variable must always be suffixed with the name of the 
+                    provided item, and should be set to the 
+                    <filename>$PN</filename> of the recipe 
+                    to which you want to give precedence.
+                    Here is an example:
+                    <literallayout class='monospaced'>
+     PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86"
+                    </literallayout>
+                </para>
             </glossdef>
         </glossentry>
 
@@ -793,8 +993,18 @@
                 <para>
                     If there are multiple versions of recipes available, this
                     variable determines which recipe should be given preference.
-                    The variable should be set to the <filename>$PV</filename> of the recipe 
-                    to whichy you want to give precedence.
+                    The variable must always be suffixed with the <filename>$PN</filename> 
+                    for which to select, and should be set to the 
+                    <filename>$PV</filename> to which you want to give precedence.
+                    You can use the "<filename>%</filename>" character as a wildcard
+                    to match any number of characters, which can be useful when 
+                    specifying versions that contain long revision number that could 
+                    potentially change.
+                    Here are two examples:
+                    <literallayout class='monospaced'>
+     PREFERRED_VERSION_python = "2.6.6"
+     PREFERRED_VERSION_linux-yocto = "3.0+git%" 
+                    </literallayout>
                 </para>
             </glossdef>
         </glossentry>
@@ -809,19 +1019,19 @@
 
         <glossentry id='var-POKYLIBC'><glossterm>POKYLIBC</glossterm>
             <glossdef>
-                <para>The <filename>libc</filename> implementation selector. 
-                    You can select <filename>glibc</filename>, <filename>eglibc</filename>, 
-                    or <filename>uclibc</filename>.</para>
+                <para>
+                    This variable is no longer supported and has been replaced by the
+                    <link linkend='var-TCLIBC'><filename>TCLIBC</filename></link> variable.
+                </para>
             </glossdef>
         </glossentry>
 
         <glossentry id='var-POKYMODE'><glossterm>POKYMODE</glossterm>
             <glossdef>
-                <para>The toolchain selector. 
-                    This variable has been replaced by <filename>TCMODE</filename>.
-                    The <filename>POKYMODE</filename> would select the external toolchain
-                    built from the Yocto Project or a few supported combinations of
-                    upstream GCC or CodeSourcery Labs toolchain.</para>
+                <para>
+                    This variable is no longer supported and has been replaced by the
+                    <link linkend='var-TCMODE'><filename>TCMODE</filename></link> variable.
+                </para>
             </glossdef>
         </glossentry>
 
@@ -843,18 +1053,48 @@
         <glossentry id='var-RDEPENDS'><glossterm>RDEPENDS</glossterm>
             <glossdef>
                 <para>
-                    A list of run-time dependencies for a package. 
-                    These packages need to be installed alongside the package to which
-                    they apply. 
-                    This enables the package to run correctly. 
-                    For example, consider a Perl script, which depends on the Perl package. 
-                    Since this variable applies to 
-                    output packages, there would usually be an override attached 
-                    to this variable such as <filename>RDEPENDS_${PN}-dev</filename>. 
-                    Names in this field must appear as they appear in the
+                    A list of packages that must be installed as part of a package being built.
+                    The package being built has a runtime dependency on the packages in the 
+                    variable's list.
+                    In other words, in order for the package being built to run correctly, 
+                    it depends on these listed packages.
+                    If a package in this list cannot be found during the build, the build
+                    will not complete.
+                </para>
+                <para>
+                    Because the <filename>RDEPENDS</filename> variable applies to packages 
+                    being built, you should 
+                    always attach an override to the variable to specify the particular runtime package
+                    that has the dependency.
+                    For example, suppose you are building a development package that depends
+                    on the <filename>perl</filename> package.
+                    In this case, you would use the following <filename>RDEPENDS</filename>
+                    statement:
+                    <literallayout class='monospaced'>
+     RDEPENDS_${PN}-dev += "perl"
+                    </literallayout>
+                    In the example, the package name (<filename>${PN}-dev</filename>) must 
+                    appear as it would in the 
                     <filename><link linkend='var-PACKAGES'>PACKAGES</link></filename> namespace before any 
                     renaming of the output package by classes like <filename>debian.bbclass</filename>.
                 </para>
+                <para>
+                    Some automatic handling occurs around the <filename>RDEPENDS</filename>
+                    variable:
+                    <itemizedlist>
+                        <listitem><para><emphasis><filename>shlibdeps</filename></emphasis>:  If a runtime
+                            package contains a shared library (<filename>.so</filename>), the build
+                            processes the library in order to determine other libraries to which it 
+                            is dynamically linked.  
+                            The build process adds these libraries to <filename>RDEPENDS</filename>
+                            to create the runtime package.</para></listitem>
+                        <listitem><para><emphasis><filename>pcdeps</filename></emphasis>:  If the package
+                            ships a <filename>pkg-config</filename> information file, the build process
+                            uses this file to add items to the <filename>RDEPENDS</filename>
+                            variable to create the runtime packages.
+                            </para></listitem>
+                    </itemizedlist>
+                </para>
             </glossdef>
         </glossentry>
 
@@ -866,8 +1106,37 @@
 
         <glossentry id='var-RRECOMMENDS'><glossterm>RRECOMMENDS</glossterm>
             <glossdef>
-                <para>The list of packages that extend usability of the package. 
-                    The packages are automatically installed but can be removed by user.</para>
+                <para>
+                    A list of packages that extend the usability of a package being 
+                    built.
+                    The package being built does not depend on this list of packages in 
+                    order to successfully build, but needs them for the extended usability.
+                    To specify runtime dependencies for packages, see the 
+                    <link linkend='var-RDEPENDS'>RDEPENDS</link> variable.
+                </para>
+                <para>
+                    The Yocto Project build process automatically installs the list of packages
+                    as part of the built package.
+                    However, you can remove them later if you want.
+                    If, during the build, a package from the list cannot be found, the build
+                    process continues without an error.
+                </para>
+                <para>
+                    Because the <filename>RRECOMMENDS</filename> variable applies to packages 
+                    being built, you should 
+                    always attach an override to the variable to specify the particular package
+                    whose usability is being extended.
+                    For example, suppose you are building a development package that is extended
+                    to support wireless functionality.
+                    In this case, you would use the following:
+                    <literallayout class='monospaced'>
+     RRECOMMENDS_${PN}-dev += "&lt;wireless_package_name&gt;"
+                    </literallayout>
+                    In the example, the package name (<filename>${PN}-dev</filename>) must 
+                    appear as it would in the 
+                    <filename><link linkend='var-PACKAGES'>PACKAGES</link></filename> namespace before any 
+                    renaming of the output package by classes like <filename>debian.bbclass</filename>.
+                </para>
             </glossdef>
         </glossentry>
 
@@ -1057,24 +1326,52 @@
         <glossentry id='var-TARGET_OS'><glossterm>TARGET_OS</glossterm>
             <glossdef>
                 <para>Specifies the target's operating system. 
-                    The variable can be set to "linux" for <filename>glibc</filename>-based systems and
-                    "linux-uclibc" for <filename>uClibc</filename>. 
+                    The variable can be set to "linux" for <filename>eglibc</filename>-based systems and
+                    to "linux-uclibc" for <filename>uclibc</filename>. 
                     For ARM/EABI targets, there are also "linux-gnueabi" and
                     "linux-uclibc-gnueabi" values possible.</para>
             </glossdef>
         </glossentry>
 
+        <glossentry id='var-TCLIBC'><glossterm>TCLIBC</glossterm>
+            <glossdef>
+                <para>
+                    Specifies which variant of the GNU standard C library (<filename>libc</filename>)
+                    to use during the build process.
+                    This variable replaces <filename>POKYLIBC</filename>, which is no longer
+                    supported.
+                </para>
+                <para>
+                    You can select <filename>eglibc</filename> or <filename>uclibc</filename>.
+                    <note>
+                        This release of the Yocto Project does not support the 
+                        <filename>glibc</filename> implementation of <filename>libc</filename>.
+                    </note>
+                </para>
+            </glossdef>
+        </glossentry>
+
         <glossentry id='var-TCMODE'><glossterm>TCMODE</glossterm>
             <glossdef>
-                <para>The toolchain selector. 
-                    This variable replaces <filename>POKYMODE</filename>.
+                <para>
+                    The toolchain selector. 
+                    This variable replaces <filename>POKYMODE</filename>, which is no longer
+                    supported.
+                </para>
+                <para>
+                    The <filename>TCMODE</filename> variable selects the external toolchain
+                    built from the Yocto Project or a few supported combinations of
+                    the upstream GCC or CodeSourcery Labs toolchain.
                     The variable determines which of the files in 
                     <filename>meta/conf/distro/include/tcmode-*</filename> is used. 
+                </para>
+                <para>
                     By default, <filename>TCMODE</filename> is set to "default", which 
-                    chooses <filename>tcmode-default.inc</filename>.</para>
-                <para>The variable is similar to <filename>TCLIBC</filename>, which controls the 
-                    <filename>libc</filename> used: <filename>eglibc</filename> or <filename>uclibc</filename>.
-                    </para>
+                    chooses <filename>tcmode-default.inc</filename>.
+                    The variable is similar to <filename>TCLIBC</filename>, which controls 
+                    the variant of the GNU standard C library (<filename>libc</filename>)
+                    used during the build process: <filename>eglibc</filename> or <filename>uclibc</filename>.
+                </para>
             </glossdef>
         </glossentry> 
 

documentation/poky-ref-manual/ref-varlocality.xml

@@ -71,10 +71,10 @@
                         </link></filename></para></listitem>
                     <listitem><para><filename><link linkend='var-MACHINE_EXTRA_RRECOMMENDS'>MACHINE_EXTRA_RRECOMMENDS
                         </link></filename></para></listitem>
-                    <listitem><para><filename><link linkend='var-MACHINE_ESSENTIAL_RDEPENDS'>MACHINE_ESSENTIAL_RDEPENDS
+                    <listitem><para><filename><link linkend='var-MACHINE_ESSENTIAL_EXTRA_RDEPENDS'>MACHINE_ESSENTIAL_EXTRA_RDEPENDS
                         </link></filename></para></listitem>
-                    <listitem><para><filename><link linkend='var-MACHINE_ESSENTIAL_RRECOMMENDS'>
-                        MACHINE_ESSENTIAL_RRECOMMENDS</link></filename></para></listitem>
+                    <listitem><para><filename><link linkend='var-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS'>
+                        MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS</link></filename></para></listitem>
                 </itemizedlist>
             </para>
         </section>

documentation/poky-ref-manual/resources.xml

@@ -32,13 +32,16 @@
     <para>
         To subscribe to the Yocto Project mailing lists, click on the following URLs and follow the instructions:
         <itemizedlist>
-            <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/yocto'></ulink> for a 
-                Yocto Discussions mailing list.</para></listitem>
-            <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/poky'></ulink> for a 
-                Yocto Project Discussions mailing list.</para></listitem>
-            <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/yocto-announce'></ulink> for a 
-                mailing list to receive offical Yocto Project announcements for developments and 
-                as well as Yocto Project milestones.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://lists.yoctoproject.org/listinfo/yocto-announce'></ulink></emphasis>:
+                Use this list to receive offical Yocto Project announcements for developments and 
+                to learn about Yocto Project milestones.</para></listitem>
+            <listitem><para><emphasis><ulink url='http://lists.yoctoproject.org/listinfo/yocto'></ulink></emphasis>:
+                Use this list to monitor Yocto Project development discussions, ask questions, and 
+                get help.</para></listitem>
+            <listitem><para><emphasis><ulink url='http://lists.yoctoproject.org/listinfo/poky'></ulink></emphasis>:
+                Use this list to monitor discussions about the Yocto Project build system Poky, 
+                ask questions, and get help.</para></listitem>
         </itemizedlist>
     </para>
 </section>
@@ -90,44 +93,14 @@
     <title>Contributions</title>
 
     <para>
-        Contributions to the Yocto Project are very welcome. 
-        You should send patches to the Yocto Project mailing list along with a "signed-off-by:"
-        line in the same style as required by the Linux kernel. 
-        Adding this line signifies the developer has agreed to the Developer's Certificate of Origin 1.1
-        as follows:
-        <literallayout class='monospaced'>
-     Developer's Certificate of Origin 1.1
-
-     By making a contribution to this project, I certify that:
-
-     (a) The contribution was created in whole or in part by me and I
-         have the right to submit it under the open source license
-         indicated in the file; or
-
-     (b) The contribution is based upon previous work that, to the best
-         of my knowledge, is covered under an appropriate open source
-         license and I have the right under that license to submit that
-         work with modifications, whether created in whole or in part
-         by me, under the same open source license (unless I am
-         permitted to submit under a different license), as indicated
-         in the file; or
-
-     (c) The contribution was provided directly to me by some other
-         person who certified (a), (b) or (c) and I have not modified
-         it.
-
-     (d) I understand and agree that this project and the contribution
-         are public and that a record of the contribution (including all
-         personal information I submit with it, including my sign-off) is
-         maintained indefinitely and may be redistributed consistent with
-         this project or the open source license(s) involved.
-        </literallayout>
-        A Poky contributions tree (<filename>poky-contrib</filename>, 
-        <filename>git://git.yoctoproject.org/poky-contrib.git</filename>)
-        exists for contributors to stage contributions.
-        If people desire such access, please ask on the mailing list. 
-        Usually, the Yocto Project team will grant access to anyone with a proven track 
-        record of good patches.
+        The Yocto Project gladly accepts contributions.
+        You can submit changes to the project either by creating and sending pull requests, 
+        or by submitting patches through email.
+        For information on how to do both, see
+        <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#how-to-submit-a-change'>
+        How to Submit a Change</ulink> in
+        <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>
+        The Yocto Project Development Manual</ulink>.
     </para>
 </section>
 

documentation/poky-ref-manual/usingpoky.xml

@@ -83,8 +83,11 @@
         <para>
             BitBake also tries to execute any dependent tasks first.
             So for example, before building <filename>matchbox-desktop</filename>, BitBake
-            would build a cross compiler and <filename>glibc</filename> if they had not already 
+            would build a cross compiler and <filename>eglibc</filename> if they had not already 
             been built.
+            <note>This release of the Yocto Project does not support the <filename>glibc</filename>
+                GNU version of the Unix standard C library.  By default, the Yocto Project builds with
+                <filename>eglibc</filename>.</note>
         </para>
 
         <para>
@@ -219,9 +222,9 @@
         <filename class="directory">tmp/deploy/images</filename>. 
         For information on how to run pre-built images such as <filename>qemux86</filename> 
         and <filename>qemuarm</filename>, see the
-        <ulink url='http://www.yoctoproject.org//docs/yocto-quick-start/yocto-project-qs.html#using-pre-built'>
+        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#using-pre-built'>
         Using Pre-Built Binaries and QEMU</ulink> section in the 
-        <ulink url='http://www.yoctoproject.org//docs/yocto-quick-start/yocto-project-qs.html'>
+        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
         Yocto Project Quick Start</ulink>.
         For information about how to install these images, see the documentation for your
         particular board/machine.

documentation/yocto-project-qs/yocto-project-qs.xml

@@ -21,7 +21,7 @@
     <para>
         This short document will give you some basic information about the environment as well 
         as let you experience it in its simplest form.  
-        After reading this document you will have a basic understanding of what the Yocto Project is
+        After reading this document, you will have a basic understanding of what the Yocto Project is
         and how to use some of its core components.  
         This document steps you through a simple example showing you how to build a small image 
         and run it using the QEMU emulator.
@@ -29,15 +29,16 @@
     <para>
         For complete information on the Yocto Project, you should check out the 
         <ulink url='http://www.yoctoproject.org'>Yocto Project Website</ulink>.
-        You can find the latest builds, breaking news, full development documentation, and a 
+        Through the website, you can find the latest builds, breaking news, full development 
+        documentation, and a 
         rich Yocto Project Development Community into which you can tap.
     </para>
     <para>
         Finally, you might find the Frequently Asked Questions (FAQ) for the Yocto Project
         at <ulink url='https://wiki.yoctoproject.org/wiki/FAQ'>Yocto Project FAQ</ulink> and 
-        the FAQ appendix located in the 
-        <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
-        Yocto Project Reference Manual</ulink> helpful.
+        the FAQ appendix located in  
+        <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
+        The Yocto Project Reference Manual</ulink> helpful.
     </para>
     <note>
         Due to production processes, there could be differences between the Yocto Project
@@ -74,7 +75,7 @@
      </mediaobject>
 
     <para>
-        Yocto Project:
+        Here are some highlights for the Yocto Project:
     </para>
 
     <itemizedlist>
@@ -85,7 +86,7 @@
             <para>Makes available system components such as X11, Matchbox, GTK+, Pimlico, Clutter,
             GuPNP and Qt (among others) so you can create a richer user interface experience on 
             devices that use displays or have a GUI.
-            For devices that don't have a GUI or display you simply would not employ these 
+            For devices that don't have a GUI or display, you simply would not employ these 
             components.</para>
         </listitem>
         <listitem>
@@ -100,9 +101,9 @@
 
     <para>
         The Yocto Project can generate images for many kinds of devices.  
-        However, the standard example machines target QEMU full system emulation for x86, ARM, MIPS,
-        and PPC-based architectures as well as specific hardware such as the Intel Desktop Board
-        DH55TC.  
+        However, the standard example machines target QEMU full-system emulation for x86, x86-64, ARM, MIPS,
+        and PPC-based architectures as well as specific hardware such as the 
+        <trademark class='registered'>Intel</trademark> Desktop Board DH55TC.  
         Because an image developed with the Yocto Project can boot inside a QEMU emulator, the 
         development environment works nicely as a test platform for developing embedded software.
     </para>
@@ -113,7 +114,7 @@
         restricted screen sizes, sits neatly on top of a device using the 
         GNOME Mobile Stack and provides a well-defined user experience. 
         Implemented in its own layer, it makes it clear to developers how they can implement 
-        their own UIs on top of Yocto Linux.
+        their own user interface on top of Yocto Linux.
     </para>
 </section>
 
@@ -128,11 +129,10 @@
         <listitem>
             <para>A host system running a supported Linux distribution (i.e. recent releases of
                 Fedora, openSUSE, Debian, and Ubuntu).
-            <note>
-                For notes about using the Yocto Project on development systems that use 
-                older Linux distributions see 
-                <ulink url='https://wiki.yoctoproject.org/wiki/BuildingOnRHEL4'></ulink>
-            </note></para>
+                If the host system supports multiple cores and threads, you can configure the 
+                Yocto Project build system to increase the time needed to build images
+                significantly.
+            </para>
         </listitem>
         <listitem>
             <para>The right packages.</para>
@@ -146,15 +146,23 @@
         <title>The Linux Distribution</title>
 
         <para>
-            The Yocto Project has been tested and is known to work on the current releases minus one
-            of the following distributions. 
-            Follow this <ulink url='https://wiki.pokylinux.org/wiki/Distro_Test'>link </ulink> for more 
-            information on distribution testing.
+            The Yocto Project team is continually verifying more and more Linux 
+            distributions with each release.
+            In general, if you have the current release minus one of the following 
+            distributions you should no problems.
             <itemizedlist>
                 <listitem><para>Ubuntu</para></listitem>
                 <listitem><para>Fedora</para></listitem>
                 <listitem><para>openSUSE</para></listitem>
             </itemizedlist>
+            For a list of the distributions under validation and their status, see the
+            <ulink url='https://wiki.yoctoproject.org/wiki/Distribution_Support'>Distribution
+            Support</ulink> wiki page.
+            <note>
+                For notes about using the Yocto Project on a RHEL 4-based host, see the
+                <ulink url='https://wiki.yoctoproject.org/wiki/BuildingOnRHEL4'>BuildingOnRHEL4</ulink>
+                wiki page.
+            </note>
             </para>
         <para>
             The build system should be able to run on any modern distribution with Python 2.6 or 2.7.
@@ -168,7 +176,7 @@
             Refer to  
             <ulink url='http://openembedded.net/index.php?title=OEandYourDistro&amp;action=historysubmit&amp;diff=4309&amp;okdid=4225'>OE and Your Distro</ulink> and 
             <ulink url='http://openembedded.net/index.php?title=Required_software&amp;action=historysubmit&amp;diff=4311&amp;oldid=4251'>Required Software</ulink> 
-            for information for other distributions used with the Open Embedded project, which might be
+            for information for other distributions used with the OpenEmbedded project, which might be
             a starting point for exploration.
             If you go down this path, you should expect problems.
             When you do, please go to <ulink url='http://bugzilla.yoctoproject.org'>Yocto Project Bugzilla</ulink>
@@ -186,9 +194,10 @@
         </para>
 
         <note><para>
-            If you are using a Fedora version prior to version 15 you will need to take some 
+            If you are using a Fedora version prior to version 15, you will need to take some 
             extra steps to enable <filename>sudo</filename>.
-            See <ulink url='https://fedoraproject.org/wiki/Configuring_Sudo'></ulink> for details.
+            See the <ulink url='https://fedoraproject.org/wiki/Configuring_Sudo'>Configuring Sudo</ulink> 
+            wiki page for details.
         </para></note>
 
         <para>
@@ -213,7 +222,7 @@
      $ sudo yum install python m4 make wget curl ftp hg tar bzip2 gzip \
      unzip python-psyco perl texinfo texi2html diffstat openjade \
      docbook-style-dsssl sed docbook-style-xsl docbook-dtds \
-     docbook-utils sed bc glibc-devel ccache pcre pcre-devel quilt \
+     docbook-utils sed bc eglibc-devel ccache pcre pcre-devel quilt \
      groff linuxdoc-tools patch linuxdoc-tools cmake help2man \
      perl-ExtUtils-MakeMaker tcl-devel gettext chrpath ncurses apr \
      SDL-devel mesa-libGL-devel mesa-libGLU-devel gnome-doc-utils \
@@ -232,7 +241,7 @@
         <title>Yocto Project Release</title>
             
         <para>
-            You can download the latest release images for the Yocto Project on the 
+            You can download the latest Yocto Project release by going to the 
             <ulink url="http://yoctoproject.org/download">Yocto Project Download page</ulink>.
             Just go to the page and click the "Yocto Downloads" link found in the "Download"
             navigation pane to the right to view all available Yocto Project releases. 
@@ -242,6 +251,17 @@
             <ulink url="http://autobuilder.yoctoproject.org/nightly/"></ulink>.  
             However, for this document a released version of Yocto Project is used.
         </para>
+
+        <para>
+            You can also get the Yocto Project files by setting up a Git repository on your host
+            development system. 
+            Doing so allows you to contribute back to the project.
+            For information on how to get set up using this method, see the 
+            "<ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#local-yp-release'>Yocto 
+            Project Release</ulink>" item in  
+            <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>The Yocto Project
+            Development Manual</ulink>.
+        </para>
     </section>
 </section>
 
@@ -249,16 +269,16 @@
     <title>A Quick Test Run</title>
 
     <para>
-        Now that you have your system requirements in order you can give Yocto Project a try.  
+        Now that you have your system requirements in order, you can give Yocto Project a try.  
         This section presents some steps that let you do the following:
     </para>
 
     <itemizedlist>
         <listitem>
-            <para>Build an image and run it in the emulator</para>
+            <para>Build an image and run it in the QEMU emulator</para>
         </listitem>
         <listitem>
-            <para>Or, use a pre-built image and run it in the emulator</para>
+            <para>Or, use a pre-built image and run it in the QEMU emulator</para>
         </listitem>
     </itemizedlist>
 
@@ -266,7 +286,8 @@
         <title>Building an Image</title>
  
         <para>
-            In the development environment you will need to build an image whenever you change hardware support, add or change system libraries, or add or change services that have dependencies.
+            In the development environment you will need to build an image whenever you change hardware 
+            support, add or change system libraries, or add or change services that have dependencies.
         </para>
 
         <mediaobject>
@@ -295,22 +316,24 @@
              through a set of locations.
              If you encounter problems with the Yocto Project finding and downloading source code, see
              the FAQ entry "How does Poky obtain source code and will it work behind my
-             firewall or proxy server?" in the 
-             <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
-             Yocto Project Reference Manual</ulink>.
+             firewall or proxy server?" in  
+             <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
+             The Yocto Project Reference Manual</ulink>.
          </para></note>
 
          <para>
              <literallayout class='monospaced'>
-     $ wget http://www.yoctoproject.org/downloads/poky/poky-bernard-5.0.1.tar.bz2
-     $ tar xjf poky-bernard-5.0.1.tar.bz2
-     $ source poky-bernard-5.0.1/poky-init-build-env poky-5.0.1-build
+     $ wget http://www.yoctoproject.org/downloads/poky/poky-edison-6.0.tar.bz2
+     $ tar xjf poky-edison-6.0.tar.bz2
+     $ source poky-edison-6.0/oe-init-build-env edison-6.0-build
              </literallayout>
          </para>
 
          <tip><para>
-             To help conserve disk space during builds you can add the following statement
-             to your <filename>local.conf</filename> file.  
+             To help conserve disk space during builds, you can add the following statement
+             to your <filename>local.conf</filename> file in the Yocto Project build
+             directory, which for this example 
+             is <filename>edison-6.0-build</filename>.
              Adding this statement deletes the work directory used for building a package
              once the package is built.
              <literallayout class='monospaced'>
@@ -319,25 +342,55 @@
          </para></tip>
 
          <itemizedlist>
-             <listitem><para>The first two commands extract the Yocto Project files from the 
-             release tarball and place them into a subdirectory of your current directory.</para></listitem>
-             <listitem><para>The <command>source</command> command creates the 
-             <filename>poky-5.0.1-build</filename> directory and executes the <command>cd</command>
-             command to make <filename>poky-5.0.1-build</filename> the working directory.
-             The resulting build directory contains all the files created during the build.   
-             By default the target architecture is qemux86.
-             To change this default, edit the value of the MACHINE variable in the 
-             <filename>conf/local.conf</filename> file.</para></listitem>
+             <listitem><para>The first command retrieves the Yocto Project release tarball from the 
+                 source repositories. 
+                 Notice, the example uses the <filename>wget</filename> shell command.
+                 Alternatively, you can go to the 
+                 <ulink url='http://www.yoctoproject.org'>Yocto Project website</ulink> downloads
+                 area to retrieve the tarball.</para></listitem>
+             <listitem><para>The second command extracts the files from the tarball and places 
+                 them into a directory named <filename>poky-edison-6.0</filename> in the current 
+                 directory. 
+               </para></listitem>
+             <listitem><para>The third command runs the Yocto Project environment setup script.
+                 Running this script defines Yocto Project build environment settings needed to 
+                 complete the build.
+                 The script also creates the Yocto Project
+                 build directory, which is <filename>edison-6.0-build</filename> in this case.
+                 After the script runs, your current working directory is set 
+                 to the build directory.
+                 Later, when the build completes, the build directory contains all the files 
+                 created during the build.
+                 </para></listitem>
          </itemizedlist>
          <para>
              Take some time to examine your <filename>conf/local.conf</filename> file found in the
-             Yocto Project file's <filename>conf</filename>.  
-             The defaults should work fine.  
-             However, if you have a multi-core CPU you might want to set the variable
-             BB_NUMBER_THREADS equal to twice the number of processor cores your system has.
-             And, set the variable PARALLEL_MAKE equal to the number of processor cores.
+             Yocto Project build directory.
+             The defaults in the <filename>local.conf</filename> should work fine.
+             However, there are some variables of interest at which you might look.
+         </para>
+
+         <para>  
+             By default, the target architecture for the build is <filename>qemux86</filename>, 
+             which is an image that can be used in the QEMU emulator and is targeted for an
+             <trademark class='registered'>Intel</trademark> 32-bit based architecture.
+             To change this default, edit the value of the <filename>MACHINE</filename> variable in the 
+             <filename>conf/local.conf</filename> file in the build directory before 
+             launching the build.
+         </para>
+
+         <para>
+             Another couple of variables of interest are the 
+             <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#var-BB_NUMBER_THREADS'><filename>BB_NUMBER_THREADS</filename></ulink> and the 
+             <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#var-PARALLEL_MAKE'><filename>PARALLEL_MAKE</filename></ulink> variables.
+             By default, these variables are commented out. 
+             However, if you have a multi-core CPU you might want to remove the comment
+             and set the variable
+             <filename>BB_NUMBER_THREADS</filename> equal to twice the number of your 
+             host's processor cores.
+             Also, you could set the variable <filename>PARALLEL_MAKE</filename> equal to the number 
+             of processor cores.
              Setting these variables can significantly shorten your build time.
-             By default, these variables are commented out.
          </para>
 
         <para>
@@ -345,9 +398,9 @@
             the image. 
             By default, the Yocto Project build system uses the RPM package manager.
             You can control this configuration by using the 
-            <filename><ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#var-PACKAGE_CLASSES'>PACKAGE_CLASSES</ulink></filename> variable.  
+            <filename><ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#var-PACKAGE_CLASSES'><filename>PACKAGE_CLASSES</filename></ulink></filename> variable.  
              For additional package manager selection information, see 
-             <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-classes-package'>Packaging - <filename>package*.bbclass</filename></ulink> in 
+             "<ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-classes-package'>Packaging - <filename>package*.bbclass</filename></ulink>" in 
              <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
              The Yocto Project Reference Manual</ulink>.
         </para>
@@ -355,18 +408,18 @@
          <para>
              Continue with the following command to build an OS image for the target, which is 
              <filename>core-image-sato</filename> in this example.
-             For information on the <filename>&dash;k</filename> option use the 
-             <filename>bitbake --help</filename> command or see
-             <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html#usingpoky-components-bitbake'>
-             BitBake</ulink> section in the Yocto Project Reference Manual.
+             For information on the <filename>-k</filename> option use the 
+             <filename>bitbake --help</filename> command or see the
+             "<ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#usingpoky-components-bitbake'>BitBake</ulink>" section in 
+             <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>The Yocto Project Reference Manual</ulink>.
              <literallayout class='monospaced'>
      $ bitbake -k core-image-sato
              </literallayout>
              <note><para>
                  BitBake requires Python 2.6 or 2.7.  For more information on this requirement, 
-                 see the FAQ appendix in the 
-                 <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
-                 Yocto Project Reference Manual</ulink>.
+                 see the FAQ appendix in  
+                 <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
+                 The Yocto Project Reference Manual</ulink>.
              </para></note>
              The final command runs the image:
              <literallayout class='monospaced'>
@@ -383,16 +436,13 @@
 
     <section id='using-pre-built'>
         <title>Using Pre-Built Binaries and QEMU</title>
+ 
         <para>
-            If hardware, libraries and services are stable you can get started by using a pre-built binary 
-            of the image, kernel and toolchain and run it using the emulator QEMU.  
+            If hardware, libraries and services are stable, you can get started by using a pre-built binary 
+            of the filesystem image, kernel, and toolchain and run it using the QEMU emulator.  
             This scenario is useful for developing application software.
         </para>
 
-        <para></para>
-        <para></para>
-        <para></para>
-
         <mediaobject>
             <imageobject>
             <imagedata fileref="figures/using-a-pre-built-image.png" format="PNG" align='center' scalefit='1'/>
@@ -400,53 +450,38 @@
             <caption>
                 <para>Using a Pre-Built Image</para>
             </caption>
-         </mediaobject>
+        </mediaobject>
 
-         <para>
-             For this scenario you need to do several things:
-         </para>
+        <para>
+            For this scenario, you need to do several things:
+        </para>
 
-         <itemizedlist>
-             <listitem>
-                 <para>
-                     Install the stand-alone Yocto toolchain tarball.
-                 </para>
-             </listitem>
-             <listitem>
-                 <para>
-                     Download the pre-built kernel that will boot with QEMU.  
-                     You need to be sure to get the QEMU image that matches your target machine’s 
-                     architecture (e.g. x86, ARM, etc.).
-                 </para>
-             </listitem>
-             <listitem>
-                 <para>
-                     Download the filesystem image for your target machine's architecture.
-                 </para>
-             </listitem>
-             <listitem>
-                 <para>
-                     Set up the environment to emulate the hardware and then start the QEMU emulator.
-                 </para>
-             </listitem>
-
-         </itemizedlist>
+        <itemizedlist>
+            <listitem><para>Install the stand-alone Yocto toolchain tarball.</para></listitem>
+            <listitem><para>Download the pre-built image that will boot with QEMU.  
+                You need to be sure to get the QEMU image that matches your target machine’s 
+                architecture (e.g. x86, ARM, etc.).</para></listitem>
+            <listitem><para>Download the filesystem image for your target machine's architecture.
+                </para></listitem>
+            <listitem><para>Set up the environment to emulate the hardware and then start the QEMU emulator.
+                </para></listitem>
+        </itemizedlist>
 
         <section id='installing-the-toolchain'>
-        <title>Installing the Toolchain</title>
-         <para>
-             You can download the pre-built toolchain, which includes the <filename>runqemu</filename> 
-             script and support files, from 
-             <ulink url='http://yoctoproject.org/downloads/yocto-1.0/toolchain/'></ulink>.  
-             Toolchains are available for 32-bit and 64-bit development systems from the 
-             <filename>i686</filename> and <filename>x86_64</filename> folders, respectively. 
-             Each type of development system supports five target architectures.
-             The tarball files are named such that a string representing the host system appears 
-             first in the filename and then is immediately followed by a string representing
-             the target architecture.
-         </para>
+            <title>Installing the Toolchain</title>
+            <para>
+                You can download the pre-built toolchain, which includes the <filename>runqemu</filename> 
+                script and support files, from 
+                <ulink url='http://yoctoproject.org/downloads/yocto-1.1/toolchain/'></ulink>.  
+                Toolchains are available for 32-bit and 64-bit development systems from the 
+                <filename>i686</filename> and <filename>x86_64</filename> folders, respectively. 
+                Each type of development system supports five target architectures.
+                The tarball files are named such that a string representing the host system appears 
+                first in the filename and then is immediately followed by a string representing
+                the target architecture.
+            </para>
 
-         <literallayout class='monospaced'>
+            <literallayout class='monospaced'>
      yocto-eglibc&lt;<emphasis>host_system</emphasis>&gt;-&lt;<emphasis>arch</emphasis>&gt;-toolchain-gmae-&lt;<emphasis>release</emphasis>&gt;.tar.bz2
 
      Where:
@@ -457,50 +492,55 @@
                 i586, x86_64, powerpc, mips, or arm.
        
          &lt;<emphasis>release</emphasis>&gt; is the version of Yocto Project.
-         </literallayout>
+            </literallayout>
 
-         <para>       
-             For example, the following toolchain tarball is for a 64-bit development 
-             host system and a 32-bit target architecture:
-         </para>
+            <para>       
+                For example, the following toolchain tarball is for a 64-bit development 
+                host system and a 32-bit target architecture:
+            </para>
 
-         <literallayout class='monospaced'>
+            <literallayout class='monospaced'>
      yocto-eglibc-x86_64-i586-toolchain-gmae-1.1.tar.bz2
-         </literallayout>
+            </literallayout>
 
-         <para>
-             The toolchain tarballs are self-contained and must be installed into <filename>/opt/poky</filename>.
-             The following commands show how you install the toolchain tarball given a 64-bit development host system
-             and a 32-bit target architecture.
-             The example assumes the toolchain tarball is located in <filename>~/toolchains/</filename>:
-         </para>
+            <para>
+                The toolchain tarballs are self-contained and must be installed into <filename>/opt/poky</filename>.
+                The following commands show how you install the toolchain tarball given a 64-bit development host system
+                and a 32-bit target architecture.
+                The example assumes the toolchain tarball is located in <filename>~/toolchains/</filename>:
+            </para>
 
-         <para>
-             <literallayout class='monospaced'>
+            <para>
+                <literallayout class='monospaced'>
      $ cd /
      $ sudo tar -xvjf ~/toolchains/yocto-eglibc-x86_64-i586-toolchain-gmae-1.1.tar.bz2
-             </literallayout>
-         </para>
-         </section>
+                </literallayout>
+            </para>
+
+            <para>
+                For more information on how to install tarballs, see the 
+                "<ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html#using-an-existing-toolchain-tarball'>Using a Cross-Toolchain Tarball</ulink>" and 
+                "<ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html#using-the-toolchain-from-within-the-build-tree'>Using BitBake and the Yocto Project Build Tree</ulink>" sections in  
+                <ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html'>The Yocto Project 
+                Application Development Toolkit (ADT) Development Manual</ulink>.
+            </para>
+        </section>
 
         <section id='downloading-the-pre-built-linux-kernel'>
-        <title>Downloading the Pre-Built Linux Kernel</title>
-         <para>
-             You can download the pre-built Linux kernel and the filesystem image suitable for 
-             running in the emulator QEMU from 
-             <ulink url='http://yoctoproject.org/downloads/yocto-1.0/machines/qemu'></ulink>.
-             Be sure to use the kernel and filesystem image that matches the architecture you want 
-             to simulate.
-             Download areas exist for the five supported machine architectures:
-             <filename>qemuarm</filename>, <filename>qemumips</filename>, <filename>qemuppc</filename>,
-             <filename>qemux86</filename>, and <filename>qemux86_64</filename>.
-         </para>
-       
-         <para>  
-             Most kernel files have one of the following forms:
-         </para>
-
-         <literallayout class='monospaced'>
+            <title>Downloading the Pre-Built Linux Kernel</title>
+      
+            <para>
+                You can download the pre-built Linux kernel suitable for running in the QEMU emulator from 
+                <ulink url='http://yoctoproject.org/downloads/yocto-1.1/machines/qemu'></ulink>.
+                Be sure to use the kernel that matches the architecture you want to simulate.
+                Download areas exist for the five supported machine architectures:
+                <filename>qemuarm</filename>, <filename>qemumips</filename>, <filename>qemuppc</filename>,
+                <filename>qemux86</filename>, and <filename>qemux86_64</filename>.
+            </para>
+         
+            <para>  
+                Most kernel files have one of the following forms:
+                <literallayout class='monospaced'>
      *zImage-&lt;<emphasis>kernel-rev</emphasis>&gt;-qemu&lt;<emphasis>arch</emphasis>&gt;-&lt;<emphasis>release</emphasis>&gt;*.bin
      vmlinux-&lt;<emphasis>kernel-rev</emphasis>&gt;-qemu&lt;<emphasis>arch</emphasis>&gt;-&lt;<emphasis>release</emphasis>&gt;*.bin
 
@@ -512,21 +552,35 @@
                 x86, x86-64, ppc, mips, or arm.
 
          &lt;<emphasis>release</emphasis>&gt; is the version of Yocto Project. 
-         </literallayout>
-         </section>
+                </literallayout>
+            </para>
+
+            <para>
+                You can learn more about downloading a Yocto Project kernel in the 
+                "<ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#local-kernel-files'>Linux Yocto Kernel</ulink>" section of  
+                <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>The 
+                Yocto Project Development Manual</ulink>.
+            </para>
+        </section>
 
         <section id='downloading-the-filesystem'>
-        <title>Downloading the Filesystem</title>
-         <para>
-             The filesystem image has two tarball forms: <filename>ext3</filename> and 
-             <filename>tar</filename>.
-             You must use the <filename>ext3</filename> form when booting an image using the 
-             QEMU emulator.
-             The <filename>tar</filename> form can be flattened out in your host development system
-             and used for Yocto Project build purposes.
-         </para>
+            <title>Downloading the Filesystem</title>
 
-          <literallayout class='monospaced'>
+            <para>
+                You can also download the filesystem image suitable for your target architecture from
+                <ulink url='http://yoctoproject.org/downloads/yocto-1.1/machines/qemu'></ulink>.
+                Again, be sure to use the filesystem that matches the architecture you want 
+                to simulate.
+            </para>
+
+            <para>
+                The filesystem image has two tarball forms: <filename>ext3</filename> and 
+                <filename>tar</filename>.
+                You must use the <filename>ext3</filename> form when booting an image using the 
+                QEMU emulator.
+                The <filename>tar</filename> form can be flattened out in your host development system
+                and used for Yocto Project build purposes.
+                <literallayout class='monospaced'>
      yocto-image-&lt;<emphasis>profile</emphasis>&gt;-qemu&lt;<emphasis>arch</emphasis>&gt;-&lt;<emphasis>release</emphasis>&gt;.rootfs.ext3.bz2
      yocto-image-&lt;<emphasis>profile</emphasis>&gt;-qemu&lt;<emphasis>arch</emphasis>&gt;-&lt;<emphasis>release</emphasis>&gt;.rootfs.tar.bz2
 
@@ -540,17 +594,17 @@
                 x86, x86-64, ppc, mips, or arm.
 
          &lt;<emphasis>release</emphasis>&gt; is the version of Yocto Project. 
-          </literallayout>
-         </section>
+                </literallayout>
+            </para>
+        </section>
 
         <section id='setting-up-the-environment-and-starting-the-qemu-emulator'>
-        <title>Setting Up the Environment and Starting the QEMU Emulator</title>
-         <para>
-             Before you start the QEMU emulator you need to set up the emulation environment.
-             The following command form sets up the emulation environment.
-         </para>
-
-         <literallayout class='monospaced'>
+            <title>Setting Up the Environment and Starting the QEMU Emulator</title>
+           
+            <para>
+                Before you start the QEMU emulator, you need to set up the emulation environment.
+                The following command form sets up the emulation environment.
+                <literallayout class='monospaced'>
      $ source /opt/poky/1.1/environment-setup-&lt;<emphasis>arch</emphasis>&gt;-poky-linux-&lt;<emphasis>if</emphasis>&gt; 
 
      Where:
@@ -559,13 +613,12 @@
 
          &lt;<emphasis>if</emphasis>&gt; is a string representing an embedded application binary interface.
               Not all setup scripts include this string.
-         </literallayout>
+                </literallayout>
+            </para>
 
-         <para>
-              Finally, this command form invokes the QEMU emulator 
-         </para>
-
-         <literallayout class='monospaced'>
+            <para>
+                Finally, this command form invokes the QEMU emulator 
+                <literallayout class='monospaced'>
      $ runqemu &lt;<emphasis>qemuarch</emphasis>&gt; &lt;<emphasis>kernel-image</emphasis>&gt; &lt;<emphasis>filesystem-image</emphasis>&gt;
 
      Where:
@@ -576,33 +629,32 @@
 
          &lt;<emphasis>filesystem-image</emphasis>&gt; is the .ext3 filesystem image.
 
-         </literallayout>
+                </literallayout>
+            </para>
 
-         <para>
-             Continuing with the example, the following two commands setup the emulation 
-             environment and launch QEMU.
-             This example assumes the root filesystem tarball has been downloaded and expanded, and 
-             that the kernel and filesystem are for a 32-bit target architecture.
-         </para>
-
-         <literallayout class='monospaced'>
+            <para>
+                Continuing with the example, the following two commands setup the emulation 
+                environment and launch QEMU.
+                This example assumes the root filesystem tarball has been downloaded and expanded, and 
+                that the kernel and filesystem are for a 32-bit target architecture.
+                <literallayout class='monospaced'>
      $ source /opt/poky/1.1/environment-setup-i686-poky-linux 
      $ runqemu qemux86 bzImage-3.0-qemux86-1.1.bin \
      yocto-image-sato-qemux86-1.1.rootfs.ext3
-         </literallayout>
+                </literallayout>
+            </para>
 
-         <para>
-             The environment in which QEMU launches varies depending on the filesystem image and on the 
-             target architecture.  For example, if you source the environment for the ARM target 
-             architecture and then boot the minimal QEMU image, the emulator comes up in a new 
-             shell in command-line mode.  However, if you boot the SDK image QEMU comes up with 
-             a GUI.
-         </para>
- 
-         <note><para>
-             Booting the PPC image results in QEMU launching in the same shell in command-line mode.
-         </para></note>
-         </section>     
+            <para>
+                The environment in which QEMU launches varies depending on the filesystem image and on the 
+                target architecture.  
+                For example, if you source the environment for the ARM target 
+                architecture and then boot the minimal QEMU image, the emulator comes up in a new 
+                shell in command-line mode.  
+                However, if you boot the SDK image, QEMU comes up with a GUI.
+                <note>Booting the PPC image results in QEMU launching in the same shell in 
+                command-line mode.</note>
+            </para>
+        </section>     
     </section>
 </section>
 

meta-yocto/conf/distro/poky.conf

@@ -1,6 +1,6 @@
 DISTRO = "poky"
-DISTRO_NAME = "Yocto (Built by Poky 5.0)"
-DISTRO_VERSION = "1.0+snapshot-${DATE}"
+DISTRO_NAME = "Yocto (Built by Poky 6.0)"
+DISTRO_VERSION = "1.1"
 SDK_VENDOR = "-pokysdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 

meta-yocto/conf/local.conf.sample

@@ -204,8 +204,8 @@ USER_CLASSES ?= "image-mklibs image-prelink"
 # newer Konsole versions behave
 #TERMCMD = "${XTERM_TERMCMD}"
 #TERMCMDRUN = "${XTERM_TERMCMDRUN}"
-# You can disable interactive patch resolution (tasks will just fail instead) with:
-#PATCHRESOLVE = "noop"
+# By default disable interactive patch resolution (tasks will just fail instead):
+PATCHRESOLVE = "noop"
 
 #
 # Shared-state files from other locations

meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb

@@ -4,11 +4,11 @@ SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-PR = "r4"
+PR = "r5"
 
 inherit update-rc.d
 
-RDEPENDS = "alsa-utils-amixer"
+RDEPENDS_${PN} = "alsa-utils-amixer"
 
 SRC_URI = "file://beagleboard-audio"
 

meta/classes/autotools.bbclass

@@ -7,7 +7,7 @@ def autotools_dep_prepend(d):
 
 	if pn in ['autoconf-native', 'automake-native', 'help2man-native']:
 		return deps
-	deps += 'autoconf-native automake-native help2man-native '
+	deps += 'autoconf-native automake-native '
 
 	if not pn in ['libtool', 'libtool-native'] and not pn.endswith("libtool-cross"):
 		deps += 'libtool-native '

meta/classes/crosssdk.bbclass

@@ -18,6 +18,7 @@ target_includedir = "${SDKPATHNATIVE}${includedir_nativesdk}"
 target_base_libdir = "${SDKPATHNATIVE}${base_libdir_nativesdk}"
 target_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}"
 target_exec_prefix = "${SDKPATHNATIVE}${exec_prefix_nativesdk}"
+baselib = "lib"
 
 do_populate_sysroot[stamp-extra-info] = ""
 do_package[stamp-extra-info] = ""

meta/classes/libc-package.bbclass

@@ -311,7 +311,7 @@ python package_do_split_gconvs () {
 			raise bb.build.FuncFailed("localedef returned an error")
 
 	def output_locale(name, locale, encoding):
-		pkgname = 'locale-base-' + legitimize_package_name(name)
+		pkgname = bb.data.getVar('MLPREFIX', d) + 'locale-base-' + legitimize_package_name(name)
 		bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
 		bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
 		rprovides = ' virtual-locale-%s' % legitimize_package_name(name)

meta/classes/multilib.bbclass

@@ -8,9 +8,13 @@ python multilib_virtclass_handler () {
         return
 
     # There should only be one kernel in multilib configs
-    if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data) or bb.data.inherits_class('allarch', e.data):
+    if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data):
         raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel")
 
+    if bb.data.inherits_class('image', e.data):
+        e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
+        return
+
     save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
     for name in save_var_name.split():
         val=e.data.getVar(name, True)
@@ -48,6 +52,18 @@ python __anonymous () {
                 newdeps.append(multilib_extend_name(variant, dep))
         d.setVar(varname, " ".join(newdeps))
 
+    if bb.data.inherits_class('image', d):
+        map_dependencies("PACKAGE_INSTALL", d)
+        map_dependencies("LINGUAS_INSTALL", d)
+        map_dependencies("RDEPENDS", d)
+        pinstall = d.getVar("LINGUAS_INSTALL", True) + " " + d.getVar("PACKAGE_INSTALL", True) + " " + d.getVar("MULTILIB_PACKAGE_INSTALL", False)
+        d.setVar("MULTILIB_PACKAGE_INSTALL", pinstall)
+        d.setVar("PACKAGE_INSTALL", "")
+        d.setVar("LINGUAS_INSTALL", "")
+        # FIXME, we need to map this to something, not delete it!
+        d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "")
+        return
+
     pkgs_mapping = []
     for pkg in (d.getVar("PACKAGES", True) or "").split():
         if pkg.startswith(variant):
@@ -76,9 +92,4 @@ python __anonymous () {
     multilib_map_variable("PACKAGES_DYNAMIC", variant, d)
     multilib_map_variable("PACKAGE_INSTALL", variant, d)
     multilib_map_variable("INITSCRIPT_PACKAGES", variant, d)
-
-    package_arch = d.getVar("PACKAGE_ARCH", True)
-    machine_arch = d.getVar("MACHINE_ARCH", True)
-    if package_arch == machine_arch:
-        d.setVar("PACKAGE_ARCH", variant + "_" + package_arch)
 }

meta/classes/multilib_global.bbclass

@@ -5,7 +5,7 @@ python multilib_virtclass_handler_global () {
     variant = e.data.getVar("BBEXTENDVARIANT", True)
 
     if isinstance(e, bb.event.RecipeParsed) and not variant:
-        if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data) or bb.data.inherits_class('allarch', e.data):
+        if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data):
             variants = (e.data.getVar("MULTILIB_VARIANTS", True) or "").split()
 
             # Process PROVIDES

meta/classes/nativesdk.bbclass

@@ -48,6 +48,7 @@ LDFLAGS = "${BUILDSDK_LDFLAGS}"
 base_prefix = "${SDKPATHNATIVE}"
 prefix = "${SDKPATHNATIVE}${prefix_nativesdk}"
 exec_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}"
+baselib = "lib"
 
 FILES_${PN} += "${prefix}"
 FILES_${PN}-dbg += "${prefix}/.debug \

meta/classes/package_rpm.bbclass

@@ -354,6 +354,8 @@ package_install_internal_rpm () {
 		-D "__dbi_txn create nofsync private" \
 		| grep -i 'Packageorigin' | cut -d : -f 2 > ${target_rootfs}/install/install_solution.manifest
 
+	touch ${target_rootfs}/install/install_multilib_solution.manifest
+
 	if [ ! -z "${multilib_to_install}" ]; then
 		for pkg in ${multilib_to_install} ; do
 			echo "Processing $pkg..."
@@ -376,25 +378,28 @@ package_install_internal_rpm () {
 			fi
 			echo $pkg_name >> ${target_rootfs}/install/install_multilib.manifest
 		done
+
+		# multilib package installation
+
+		# Generate an install solution by doing a --justdb install, then recreate it with
+		# an actual package install!
+		${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
+			--predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \
+			-D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}-ml_archs.macro`" \
+			-D "__dbi_txn create nofsync" \
+			-U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \
+			${target_rootfs}/install/install_multilib.manifest
+
+		# Now that we have a solution, pull out a list of what to install...
+		echo "Manifest: ${target_rootfs}/install/install_multilib.manifest"
+		${RPM} -D "_dbpath ${target_rootfs}/install" -qa --yaml \
+			-D "__dbi_txn create nofsync private" \
+			| grep -i 'Packageorigin' | cut -d : -f 2 > ${target_rootfs}/install/install_multilib_solution.manifest
+
 	fi
 
-	# multilib package installation
-
-	# Generate an install solution by doing a --justdb install, then recreate it with
-	# an actual package install!
-	${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
-		--predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \
-		-D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}-ml_archs.macro`" \
-		-D "__dbi_txn create nofsync" \
-		-U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \
-		${target_rootfs}/install/install_multilib.manifest
-
-	# Now that we have a solution, pull out a list of what to install...
-	echo "Manifest: ${target_rootfs}/install/install_multilib.manifest"
-	${RPM} -D "_dbpath ${target_rootfs}/install" -qa --yaml \
-		-D "__dbi_txn create nofsync private" \
-		| grep -i 'Packageorigin' | cut -d : -f 2 > ${target_rootfs}/install/install_multilib_solution.manifest
-
+	cat ${target_rootfs}/install/install_solution.manifest > ${target_rootfs}/install/total_solution.manifest
+	cat ${target_rootfs}/install/install_multilib_solution.manifest >> ${target_rootfs}/install/total_solution.manifest
 
 	# Attempt install
 	${RPM} --root ${target_rootfs} \
@@ -403,8 +408,7 @@ package_install_internal_rpm () {
 		-D "_dbpath ${rpmlibdir}" \
 		--noscripts --notriggers --noparentdirs --nolinktos --replacepkgs \
 		-D "__dbi_txn create nofsync private" \
-		-Uhv ${target_rootfs}/install/install_solution.manifest \
-		${target_rootfs}/install/install_multilib_solution.manifest
+		-Uhv ${target_rootfs}/install/total_solution.manifest
 }
 
 python write_specfile () {
@@ -903,8 +907,14 @@ python do_package_rpm () {
 	rpmbuild = bb.data.getVar('RPMBUILD', d, True)
 	targetsys = bb.data.getVar('TARGET_SYS', d, True)
 	targetvendor = bb.data.getVar('TARGET_VENDOR', d, True)
-	pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d)
-	pkgarch = bb.data.expand('${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d)
+	package_arch = bb.data.getVar('PACKAGE_ARCH', d, True) or ""
+	if package_arch not in "all any noarch".split():
+		ml_prefix = (bb.data.getVar('MLPREFIX', d, True) or "").replace("-", "_")
+		bb.data.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch, d)
+	else:
+		bb.data.setVar('PACKAGE_ARCH_EXTEND', package_arch, d)
+	pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}', d)
+	pkgarch = bb.data.expand('${PACKAGE_ARCH_EXTEND}${TARGET_VENDOR}-${TARGET_OS}', d)
 	magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d)
 	bb.mkdirhier(pkgwritedir)
 	os.chmod(pkgwritedir, 0755)

meta/classes/populate_sdk_rpm.bbclass

@@ -35,7 +35,7 @@ fakeroot populate_sdk_rpm () {
 	export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_TARGET_TASK}"
 	export INSTALL_PACKAGES_ATTEMPTONLY_RPM=""
 	export INSTALL_PACKAGES_LINGUAS_RPM=""
-	export INSTALL_PROVIDENAME_RPM=""
+	export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig pkgconfig(pkg-config)"
 	export INSTALL_TASK_RPM="populate_sdk-target"
 
 	# Setup base system configuration
@@ -84,7 +84,7 @@ EOF
 	export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}"
 	export INSTALL_PACKAGES_ATTEMPTONLY_RPM=""
 	export INSTALL_PACKAGES_LINGUAS_RPM=""
-	export INSTALL_PROVIDENAME_RPM="/bin/sh"
+	export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig libGL.so()(64bit) libGL.so"
 	export INSTALL_TASK_RPM="populate_sdk_rpm-nativesdk"
 
 	# List must be prefered to least preferred order

meta/classes/rootfs_rpm.bbclass

@@ -220,8 +220,8 @@ python () {
             default_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False)
             if default_tune:
                 localdata.setVar("DEFAULTTUNE", default_tune)
-            localdata.setVar("MACHINE_ARCH", eext[1] + "_" + localdata.getVar("MACHINE_ARCH", False))
             package_archs = localdata.getVar("PACKAGE_ARCHS", True) or ""
+            package_archs = " ".join([i in "all noarch any".split() and i or eext[1]+"_"+i for i in package_archs.split()])
             ml_package_archs += " " + package_archs
             ml_prefix_list += " " + eext[1]
             #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides))

meta/classes/toolchain-scripts.bbclass

@@ -96,7 +96,7 @@ toolchain_create_sdk_env_script_for_installer () {
 	echo 'export CPPFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
 	echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
 	echo 'export OECORE_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
-        echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/acloal"' >> $script
+        echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/aclocal"' >> $script
 	echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
 	echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
 }

meta/conf/machine/include/tune-i586.inc

@@ -1,5 +1,6 @@
 DEFAULTTUNE ?= "i586"
-TUNE_PKGARCH ?= "i586"
+TUNE_PKGARCH_TMP = "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d)}"
+TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "i586", "i586", TUNE_PKGARCH_TMP, d)}"
 
 require conf/machine/include/ia32/arch-ia32.inc
 

meta/conf/multilib.conf

@@ -452,3 +452,10 @@ BBCLASSEXTEND_append_pn-zip = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-zlib = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-zypper = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-libsdl = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-qemu-config = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-x11-common = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-update-rc.d = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-avahi-ui = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-python-pycairo = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-python-pygtk = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-python-pygobject = " ${MULTILIBS}"

meta/recipes-bsp/qemu-config/qemu-config.bb

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa
 
 COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
 
-PR = "r21"
+PR = "r22"
 
 SRC_URI = "file://distcc.sh \
            file://anjuta-remote-run \
@@ -32,6 +32,11 @@ do_install() {
     install qemu-autostart ${D}/etc/init.d/
 }
 
+pkg_postinst_${PN} () {
+    grep -q qemuarm $D${sysconfdir}/hostname && \
+        sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/'
+}
+
 RDEPENDS_${PN} = "distcc dbus-x11 task-core-nfs-server oprofileui-server rsync bash"
 
 inherit update-rc.d allarch

meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Shutdown
-Comment=Close down the machine safely
-Exec=reboot
-Icon=system-shutdown
-Terminal=false
-Categories=Utility;
-StartupNotify=true

meta/recipes-devtools/diffstat/diffstat/dirfix.patch

@@ -0,0 +1,27 @@
+$libdir isn't used by the Makefile at all apart from in this mkdir.
+This will be used without any DESTDIR so if your libdir is a different
+layout to the bulid system it will cause a failure. E.g:
+
+Build system has /usr/lib only
+libdir = /usr/lib64 for the target
+Results in "mkdir: cannot create directory `/usr/lib64': Permission denied"
+
+Since the directory is never used, we can just remove the mkdir.
+
+Upstream-Status: Pending
+
+RP 23/9/2011
+
+Index: diffstat-1.54/makefile.in
+===================================================================
+--- diffstat-1.54.orig/makefile.in	2011-09-22 19:13:11.330158571 +0100
++++ diffstat-1.54/makefile.in	2011-09-22 19:13:35.610158363 +0100
+@@ -79,7 +79,7 @@
+ 	$(INSTALL_DATA) $(srcdir)/$(THIS).1 $(man1dir)/$(THIS).$(manext)
+ 
+ installdirs :
+-	mkdir -p $(BINDIR) $(libdir) $(man1dir)
++	mkdir -p $(BINDIR) $(man1dir)
+ 
+ uninstall :
+ 	rm -f $(BINDIR)/$(PROG) $(man1dir)/$(THIS).$(manext)

meta/recipes-devtools/diffstat/diffstat_1.54.bb

@@ -6,9 +6,10 @@ HOMEPAGE = "http://invisible-island.net/diffstat/"
 SECTION = "devel"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz"
+SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \
+           file://dirfix.patch"
 
 SRC_URI[md5sum] = "af08bef2eb37050ceb0c4fddedb2ee36"
 SRC_URI[sha256sum] = "d8e67660ec85be597f8548ecdd088926639dac34ec7184aaf9d09c1e6ecb83e5"

meta/recipes-devtools/intltool/intltool.inc

@@ -7,6 +7,7 @@ SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2"
 S = "${WORKDIR}/intltool-${PV}"
 
 DEPENDS = "libxml-parser-perl-native"
+DEPENDS_virtclass-native = "libxml-parser-perl-native"
 #RDEPENDS_${PN} = "libxml-parser-perl"
 RRECOMMENDS_${PN} = "perl-modules"
 RRECOMMENDS_${PN}_virtclass-native = ""

meta/recipes-devtools/python/python-pygobject_2.27.91.bb

@@ -2,7 +2,7 @@ DESCRIPTION = "Python GObject bindings"
 SECTION = "devel/python"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
-DEPENDS = "python python-pygobject-native-${PV} glib-2.0"
+DEPENDS = "python python-pygobject-native glib-2.0"
 DEPENDS_virtclass-native = "glib-2.0-native"
 RDEPENDS_virtclass-native = ""
 PR = "r2"

meta/recipes-devtools/rpm/rpm_5.4.0.bb

@@ -44,8 +44,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
 extrarpmdeps = "python perl"
-extrarpmdeps_virtclass-native = ""
-PR = "r21"
+extrarpmdeps_virtclass-native = "file-native"
+PR = "r22"
 
 # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
 # in order to extract the distribution SRPM into a format we can extract...
@@ -119,7 +119,7 @@ EXTRA_OECONF = "--verbose \
 		${WITH_DB} \
 		${WITH_Z} \
 		--with-file \
-		--with-path-magic=/usr/share/misc/magic \
+		--with-path-magic=%{_usrlibrpm}/../../share/misc/magic \
 		--without-lua \
 		--without-tcl \
 		--with-syck=internal \
@@ -289,6 +289,7 @@ FILES_${PN}-build = "${prefix}/src/rpm \
 		${libdir}/rpm/vpkg-provides2.sh \
 		${libdir}/rpm/perfile_rpmdeps.sh \
 		"
+RDEPENDS_${PN}-build = "file"
 
 #%rpmattr       %{_rpmhome}/gem_helper.rb
 #%rpmattr       %{_rpmhome}/symclash.*
@@ -420,6 +421,13 @@ do_install_append_virtclass-native() {
 		RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \
 		RPM_LOCALEDIRRPM=${STAGING_DATADIR_NATIVE}/locale
 
+	for rpm_binary in ${D}/${libdir}/rpm/bin/rpm*; do
+        	create_wrapper $rpm_binary
+			RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \
+			RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \
+			RPM_LOCALEDIRRPM=${STAGING_DATADIR_NATIVE}/locale
+	done
+
 	# Adjust popt macros to match...
 	cat ${D}/${libdir}/rpm/rpmpopt | sed -e "s,^\(rpm[^ 	]*\)\([ 	]\),\1.real\2," > ${D}/${libdir}/rpm/rpmpopt.new
 	mv ${D}/${libdir}/rpm/rpmpopt.new ${D}/${libdir}/rpm/rpmpopt

meta/recipes-extended/ghostscript/ghostscript_9.02.bb

@@ -36,6 +36,11 @@ SRC_URI[sha256sum] = "03ea2cad13a36f8f9160912012b79619a826e7148fada6d3531feb2540
 
 EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper --with-fontpath=${datadir}/fonts"
 
+# This has been fixed upstream but for now we need to subvert the check for time.h
+# http://bugs.ghostscript.com/show_bug.cgi?id=692443
+# http://bugs.ghostscript.com/show_bug.cgi?id=692426
+CFLAGS += "-DHAVE_SYS_TIME_H=1"
+
 inherit autotools
 
 do_configure () {

meta/recipes-extended/libzypp/libzypp_git.bb

@@ -8,13 +8,10 @@ inherit cmake gettext
 
 DEPENDS  = "rpm boost curl libxml2 zlib sat-solver expat openssl udev"
 
-# rpmdb2solv from sat-solver is run from libzypp
-RDEPENDS_${PN} = "sat-solver"
-
 S = "${WORKDIR}/git"
 SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
 PV = "0.0-git${SRCPV}"
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
            file://no-doc.patch \
@@ -32,6 +29,9 @@ SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
 # ARM specific global constructor workaround
 SRC_URI_append_arm  = " file://arm-workaround-global-constructor.patch"
 
+# rpmdb2solv from sat-solver is run from libzypp
+RDEPENDS_${PN} = "sat-solver rpm-libs"
+
 PACKAGES =+ "${PN}-pkgmgt"
 
 FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons"

meta/recipes-extended/sat-solver/sat-solver_git.bb

@@ -8,7 +8,7 @@ DEPENDS = "libcheck rpm zlib expat db"
 
 SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32"
 PV = "0.0-git${SRCPV}"
-PR = "r11"
+PR = "r12"
 
 PARALLEL_MAKE=""
 
@@ -29,6 +29,8 @@ EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
 
 inherit cmake pkgconfig
 
+RDEPENDS_${PN} = "rpm-libs"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_archgen () {

meta/recipes-extended/zypper/zypper_git.bb

@@ -5,8 +5,7 @@ LICENSE  = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413"
 
 DEPENDS  = "libzypp augeas"
-RRECOMMENDS_${PN} = "procps util-linux-uuidgen"
-PR = "r5"
+PR = "r6"
 SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582"
 
 inherit cmake
@@ -20,4 +19,7 @@ S = "${WORKDIR}/git"
 
 PV = "1.5.3-git${SRCPV}"
 
+RDEPENDS_${PN} = "rpm-libs"
+RRECOMMENDS_${PN} = "procps util-linux-uuidgen"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"

meta/recipes-gnome/gnome/gnome-desktop.inc

@@ -1,7 +1,7 @@
 DESCRIPTION = "GNOME library for reading .desktop files"
 SECTION = "x11/gnome"
 LICENSE = "GPLv2 & LGPLv2"
-DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils"
+DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification"
 
 EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
 
@@ -11,7 +11,11 @@ do_configure_prepend () {
 
 FILES_${PN} += "${datadir}/gnome-about"
 
-PR = "r1"
+PR = "r3"
 
 inherit gnome pkgconfig
 
+do_install_append () {
+	sed -i -e's,${STAGING_BINDIR_NATIVE},${bindir},g' ${D}${bindir}/gnome-about
+}
+

meta/recipes-gnome/gtk+/gtk+_2.22.1.bb

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
                     file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
                     file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
            file://xsettings.patch \
@@ -31,7 +31,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "fdce46ba354c155230b7d4090b17f7d9"
 SRC_URI[sha256sum] = "965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07"
 
-EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups"
+EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
 
 LIBV = "2.10.0"
 

meta/recipes-graphics/cairo/cairo.inc

@@ -18,3 +18,6 @@ require cairo-fpu.inc
 EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
 
 inherit autotools pkgconfig
+
+# We don't depend on binutils so we need to disable this
+export ac_cv_lib_bfd_bfd_openr=no

meta/recipes-graphics/cairo/cairo_1.10.2.bb

@@ -2,7 +2,7 @@ require cairo.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
 

meta/recipes-graphics/mesa/qemugl/call_opengl_fix.patch

@@ -0,0 +1,58 @@
+Save registers via local variables instead of simple "push", so that gcc become
+aware of this operation and avoid stack disorder.
+
+opengl calling (in call_opengl_qemu) includes 4 steps:
+1. prepare opengl parameters on stack
+2. save some "input" register by push
+3. load "input" register with parameters on stack via same index as step 1
+4. issue "int 0x99" to trap into qemu, who will get parameter in the registers
+
+New gcc uses "%esp" rather than "%ebp" to index local variable in stack, which
+leads wrong index in step 3, as push decrease "%esp" automatically. Saving
+registers via local variables to fix it.
+
+Upstream-Status: Pending
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Index: git/opengl_client.c
+===================================================================
+--- git.orig/opengl_client.c	2011-09-19 19:44:51.000000000 +0800
++++ git/opengl_client.c	2011-09-22 10:11:04.000000000 +0800
+@@ -1076,23 +1076,29 @@
+ {
+ #if defined(__i386__)
+   int ret;
++  int bx, cx, dx, si;
+ #ifdef WIN32
+   __asm__ ("pushl %0;pushl %%fs:0;movl %%esp,%%fs:0;" : : "g" (win32_sigsegv_handler));
+ #endif
+-  __asm__ ("push %ebx");
+-  __asm__ ("push %ecx");
+-  __asm__ ("push %edx");
+-  __asm__ ("push %esi");
++  /* save registers before opengl call */
++  __asm__ ("mov %%ebx, %0"::"m"(bx));
++  __asm__ ("mov %%ecx, %0"::"m"(cx));
++  __asm__ ("mov %%edx, %0"::"m"(dx));
++  __asm__ ("mov %%esi, %0"::"m"(si));
++
+   __asm__ ("mov %0, %%eax"::"m"(func_number));
+   __asm__ ("mov %0, %%ebx"::"m"(pid));
+   __asm__ ("mov %0, %%ecx"::"m"(ret_string));
+   __asm__ ("mov %0, %%edx"::"m"(args));
+   __asm__ ("mov %0, %%esi"::"m"(args_size));
+   __asm__ ("int $0x99");
+-  __asm__ ("pop %esi");
+-  __asm__ ("pop %edx");
+-  __asm__ ("pop %ecx");
+-  __asm__ ("pop %ebx");
++
++  /* restore registers */
++  __asm__ ("mov %0, %%ebx"::"m"(bx));
++  __asm__ ("mov %0, %%ecx"::"m"(cx));
++  __asm__ ("mov %0, %%edx"::"m"(dx));
++  __asm__ ("mov %0, %%esi"::"m"(si));
++
+   __asm__ ("mov %%eax, %0"::"m"(ret));
+ #ifdef WIN32
+   __asm__ ("movl (%%esp),%%ecx;movl %%ecx,%%fs:0;addl $8,%%esp;" : : : "%ecx");

meta/recipes-graphics/mesa/qemugl_git.bb

@@ -11,13 +11,14 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)'
 
 SRC_URI = "git://git.o-hand.com/qemugl.git;protocol=git \
            file://versionfix.patch \
-           file://remove-x11r6-lib-dir.patch"
+           file://remove-x11r6-lib-dir.patch \
+           file://call_opengl_fix.patch"
 S = "${WORKDIR}/git"
 
 SRCREV = "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
 
 PV = "0.0+git${SRCPV}"
-PR = "r7"
+PR = "r8"
 
 DEFAULT_PREFERENCE = "-1"
 

meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb

@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
 SRCREV_machine_qemuppc ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
-SRCREV_meta ?= "0dcdf7bb40a8e1fb18fd27d442fa5ace8cff4941"
+SRCREV_meta ?= "d05450e4aef02c1b7137398ab3a9f8f96da74f52"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.0.bb

@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "eccd57eaa4c2b580b9adbbc39e19ecbff56779ae"
 SRCREV_machine_qemux86 ?= "72671808fdbe69a9fe03fd8f094e7c59da04a28c"
 SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1"
 SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e"
-SRCREV_meta ?= "0dcdf7bb40a8e1fb18fd27d442fa5ace8cff4941"
+SRCREV_meta ?= "d05450e4aef02c1b7137398ab3a9f8f96da74f52"
 
 PR = "r2"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-multimedia/libsndfile/libsndfile1_1.0.24.bb

@@ -4,7 +4,7 @@ AUTHOR = "Erik de Castro Lopo"
 DEPENDS = "sqlite3"
 SECTION = "libs/multimedia"
 LICENSE = "LGPLv2.1"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz"
 
@@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a"
 
 S = "${WORKDIR}/libsndfile-${PV}"
 
+EXTRA_OECONF = "--disable-external-libs"
+
 inherit autotools lib_package pkgconfig
 
 do_configure_prepend_arm() {

meta/recipes-support/attr/acl_2.2.51.bb

@@ -1,6 +1,6 @@
 require acl.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267"
 SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225"

meta/recipes-support/attr/attr_2.4.46.bb

@@ -1,6 +1,6 @@
 require attr.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010"
 SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"

meta/recipes-support/attr/ea-acl.inc

@@ -35,3 +35,20 @@ BBCLASSEXTEND = "native"
 # Only append ldflags for target recipe and if USE_NLS is enabled
 LDFLAGS_append_libc-uclibc = "${@['', ' -lintl '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'yes')]}"
 EXTRA_OECONF_append_libc-uclibc = "${@['', ' --disable-gettext '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'no')]}"
+
+fix_symlink () {
+	# Remove bad symlinks & create the correct symlinks
+	if test -L ${libdir}/lib${BPN}.so ; then
+		rm -rf ${libdir}/lib${BPN}.so
+		ln -sf ${base_libdir}/lib${BPN}.so ${libdir}/lib${BPN}.so
+	fi
+	if test -L ${base_libdir}/lib${BPN}.a ; then
+		rm -rf ${base_libdir}/lib${BPN}.a
+		ln -sf ${libdir}/lib${BPN}.a ${base_libdir}/lib${BPN}.a
+	fi
+	if test -L  ${base_libdir}/lib${BPN}.la ; then
+		rm -rf ${base_libdir}/lib${BPN}.la
+		ln -sf ${libdir}/lib${BPN}.la ${base_libdir}/lib${BPN}.la
+	fi
+}
+SSTATEPOSTINSTFUNCS_virtclass-native += "fix_symlink"

meta/recipes-support/neon/neon_0.29.5.bb

@@ -4,9 +4,9 @@ SECTION = "libs"
 LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \
                     file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037"
-DEPENDS = "zlib libxml2 expat time gnutls"
+DEPENDS = "zlib libxml2 expat time gnutls libproxy"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \
            file://pkgconfig.patch"

scripts/help2man

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 1

scripts/runqemu-export-rootfs

@@ -118,6 +118,9 @@ case "$1" in
 		echo "    echo RPCBIND_OPTIONS=-i >> /etc/sysconfig/rpcbind"
 		echo "    /etc/init.d/rpcbind restart"
 		echo "==============================================="
+		echo "For Ubuntu 11.10 hosts"
+		echo "Add OPTIONS=\"-i -w\"  to /etc/default/rpcbind"
+		echo "sudo service portmap restart"
 	    fi
 	    exit 1
 	fi