documentation/poky-ref-manual/extendpoky.xml: removed pokylinux.org link

There was a link whose URL was http://autobuilder.pokylinux.org:8010. I changed the link to use yoctoproject.org. Note that this URL was not visible to the reader in the manual. However, it was there in the DocBook code. (From yocto-docs rev: ca1cf9fb404f148fe4f0868630dc4f109231c5c3) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
documentation/poky-ref-manual/resources.xml: removed referenct to poky linux site
2026-03-17 12:49:40 +01:00 · 2011-12-20 22:35:18 +00:00 · 2011-12-20 22:35:17 +00:00 · 2011-12-20 22:35:17 +00:00 · 2011-12-20 22:35:17 +00:00 · 2011-12-20 22:35:17 +00:00
71 changed files with 958 additions and 296 deletions
--- a/bitbake/lib/bb/persist_data.py
+++ b/bitbake/lib/bb/persist_data.py
@@ -112,7 +112,7 @@ class SQLData(object):
        bb.utils.mkdirhier(os.path.dirname(filename))

        self.filename = filename
-        self.connection = sqlite3.connect(filename, timeout=5,
+        self.connection = sqlite3.connect(filename, timeout=30,
                                          isolation_level=None)
        self.cursor = self.connection.cursor()
        self._tables = {}
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -0,0 +1,142 @@
+# This is a single Makefile to handle all generated Yocto Project documents.
+# The Makefile needs to live in the documents directory and all figures used
+# in any manuals must be PNG files and live in the individual book's figures
+# directory.
+#
+# The Makefile has these targets:
+#
+#    pdf: generates a PDF version of a manual.  Not valid for the Quick Start
+#    html: generates an HTML version of a manual.
+#    tarball: creates a tarball for the doc files.
+#    validate: validates 
+#    publish: pushes generated files to the Yocto Project website
+#    clean: removes files
+#
+# The Makefile generates an HTML and PDF version of every document except the
+# Yocto Project Quick Start.  The Quick Start is in HTML form only.  The variable
+# The command-line argument DOC represents the folder name in which a particular 
+# document is stored.  The command-line argument VER represents the distro 
+# version of the Yocto Release for which the manuals are being generated.
+# You must invoke the Makefile with the DOC and VER arguments.
+# Examples:
+#
+#     make DOC=bsp-guide VER=1.1
+#     make DOC=yocto-project-qs VER=1.1
+#     make pdf DOC=yocto-project-qs VER=1.1
+#
+# The first example generates the HTML and PDF versions of the BSP Guide for 
+# the Yocto Project 1.1 Release.  The second example generates the HTML version
+# of the Quick Start.  The third example generates an error because you cannot
+# generate a PDF version of the Quick Start.
+#
+# Use the publish target to push the generated manuals to the Yocto Project 
+# website.  All files needed for the manual's HTML form are pushed as well as the 
+# PDF version (if applicable).  
+# Examples:
+#
+#    make publish DOC=bsp-guide VER=1.1
+#    make publish DOC=adt-manual VER=1.1
+#
+
+ifeq ($(DOC),bsp-guide)
+XSLTOPTS = --stringparam html.stylesheet style.css \
+           --stringparam  chapter.autolabel 1 \
+           --stringparam  section.autolabel 1 \
+           --stringparam  section.label.includes.component.label 1 \
+           --xinclude
+ALLPREQ = html pdf tarball
+TARFILES = style.css bsp-guide.html bsp-guide.pdf figures/bsp-title.png
+MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf
+FIGURES = figures
+STYLESHEET = $(DOC)/*.css
+
+endif
+
+ifeq ($(DOC),yocto-project-qs)
+XSLTOPTS = --stringparam html.stylesheet style.css \
+           --xinclude
+ALLPREQ = html tarball
+TARFILES = yocto-project-qs.html style.css figures/yocto-environment.png figures/building-an-image.png figures/using-a-pre-built-image.png figures/yocto-project-transp.png
+MANUALS = $(DOC)/$(DOC).html
+FIGURES = figures
+STYLESHEET = $(DOC)/*.css
+endif
+
+ifeq ($(DOC),poky-ref-manual)
+XSLTOPTS = --stringparam html.stylesheet style.css \
+           --stringparam  chapter.autolabel 1 \
+           --stringparam  appendix.autolabel A \
+           --stringparam  section.autolabel 1 \
+           --stringparam  section.label.includes.component.label 1 \
+           --xinclude
+ALLPREQ = html pdf tarball
+TARFILES = poky-ref-manual.html style.css figures/poky-title.png figures/ss-sato.png
+MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf
+FIGURES = figures
+STYLESHEET = $(DOC)/*.css
+endif
+
+
+ifeq ($(DOC),adt-manual)
+XSLTOPTS = --stringparam html.stylesheet style.css \
+           --stringparam  chapter.autolabel 1 \
+           --stringparam  appendix.autolabel A \
+           --stringparam  section.autolabel 1 \
+           --stringparam  section.label.includes.component.label 1 \
+           --xinclude
+ALLPREQ = html pdf tarball
+TARFILES = adt-manual.html adt-manual.pdf style.css figures/adt-title.png
+MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf
+FIGURES = figures
+STYLESHEET = $(DOC)/*.css
+endif
+
+ifeq ($(DOC),kernel-manual)
+XSLTOPTS = --stringparam html.stylesheet style.css \
+           --stringparam  chapter.autolabel 1 \
+           --stringparam  appendix.autolabel A \
+           --stringparam  section.autolabel 1 \
+           --stringparam  section.label.includes.component.label 1 \
+           --xinclude
+ALLPREQ = html pdf tarball
+TARFILES = kernel-manual.html kernel-manual.pdf style.css figures/kernel-title.png figures/kernel-architecture-overview.png
+MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf
+FIGURES = figures
+STYLESHEET = $(DOC)/*.css
+endif
+
+
+##
+# These URI should be rewritten by your distribution's xml catalog to
+# match your localy installed XSL stylesheets.
+XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
+XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
+
+all: $(ALLPREQ)
+
+pdf:
+ifeq ($(DOC),yocto-project-qs)
+	@echo " "
+	@echo "ERROR: You cannot generate a PDF file for the Yocto Project Quick Start"
+	@echo " "
+else
+	cd $(DOC); ../tools/poky-docbook-to-pdf $(DOC).xml ../template; cd ..
+endif
+    
+html:
+#       See http://www.sagehill.net/docbookxsl/HtmlOutput.html 
+	cd $(DOC); xsltproc $(XSLTOPTS) -o $(DOC).html $(DOC)-customization.xsl $(DOC).xml; cd ..
+
+tarball: html
+	cd $(DOC); tar -cvzf $(DOC).tgz $(TARFILES); cd ..
+
+validate:
+	cd $(DOC); xmllint --postvalid --xinclude --noout $(DOC).xml; cd ..
+
+
+publish:
+	scp -r $(MANUALS) $(STYLESHEET) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/$(VER)/$(DOC)
+	cd $(DOC); scp -r $(FIGURES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/$(VER)/$(DOC)/figures
+
+clean:
+	rm -f $(MANUALS)
--- a/documentation/adt-manual/Makefile
+++ b/documentation/adt-manual/Makefile
@@ -1,42 +0,0 @@
-XSLTOPTS = --stringparam html.stylesheet style.css \
-           --stringparam  chapter.autolabel 1 \
-           --stringparam  appendix.autolabel A \
-           --stringparam  section.autolabel 1 \
-           --stringparam  section.label.includes.component.label 1 \
-         --xinclude
-
-##
-# These URI should be rewritten by your distribution's xml catalog to
-# match your localy installed XSL stylesheets.
-XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
-XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
-
-all: html pdf tarball
-
-pdf:
-	../tools/poky-docbook-to-pdf adt-manual.xml ../template
-
-##
-# These URI should be rewritten by your distribution's xml catalog to
-# match your localy installed XSL stylesheets.
-
-html:
-#       See http://www.sagehill.net/docbookxsl/HtmlOutput.html 
-
-#	xsltproc $(XSLTOPTS) -o adt-manual.html $(XSL_XHTML_URI) adt-manual.xml
-	xsltproc $(XSLTOPTS) -o adt-manual.html adt-manual-customization.xsl adt-manual.xml
-
-tarball: html
-	tar -cvzf adt-manual.tgz adt-manual.html adt-manual.pdf style.css figures/adt-title.png figures/yocto-project-transp.png
-
-validate:
-	xmllint --postvalid --xinclude --noout adt-manual.xml
-
-OUTPUTS = adt-manual.tgz adt-manual.html adt-manual.pdf
-SOURCES = *.png *.xml *.css
-
-publish:
-	scp -r $(OUTPUTS) $(SOURCES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-doc/adt-manual
-
-clean:
-	rm -f $(OUTPUTS)
--- a/documentation/adt-manual/adt-manual.xml
+++ b/documentation/adt-manual/adt-manual.xml
@@ -33,6 +33,16 @@
                <date>6 April 2011</date>
                <revremark>Initial Document released with Yocto Project 1.0 on 6 April 2011.</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>
+            </revision>
+            <revision>
+                <revnumber>1.0.2</revnumber>
+                <date>20 December 2011</date>
+                <revremark>Released with Yocto Project 1.0.2 on 20 December 2011.</revremark>
+            </revision>
        </revhistory>

    <copyright>
--- a/documentation/adt-manual/figures/yocto-project-transp.png
+++ b/documentation/adt-manual/figures/yocto-project-transp.png
--- a/documentation/bsp-guide/Makefile
+++ b/documentation/bsp-guide/Makefile
@@ -1,35 +0,0 @@
-XSLTOPTS = --stringparam html.stylesheet style.css \
-           --stringparam  chapter.autolabel 1 \
-           --stringparam  section.autolabel 1 \
-           --stringparam  section.label.includes.component.label 1 \
-	   --xinclude
-
-##
-# These URI should be rewritten by your distribution's xml catalog to
-# match your localy installed XSL stylesheets.
-XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
-XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
-
-all: html pdf tarball
-
-pdf:
-	../tools/poky-docbook-to-pdf bsp-guide.xml ../template
-
-html:
-#       See http://www.sagehill.net/docbookxsl/HtmlOutput.html 
-	xsltproc $(XSLTOPTS) -o bsp-guide.html bsp-guide-customization.xsl bsp-guide.xml
-
-tarball: html
-	tar -cvzf bsp-guide.tgz style.css bsp-guide.html bsp-guide.pdf figures/bsp-title.png
-
-validate:
-	xmllint --postvalid --xinclude --noout bsp-guide.xml
-
-OUTPUTS = bsp-guide.pdf bsp-guide.html
-SOURCES = *.png *.xml *.css *.svg
-
-publish:
-	scp -r $(OUTPUTS) $(SOURCES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-doc/bsp-guide
-
-clean:
-	rm -f $(OUTPUTS)
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -39,6 +39,16 @@
                <date>6 April 2011</date>
                <revremark>This manual revision corresponds to 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>
+            </revision>
+            <revision>
+                <revnumber>1.0.2</revnumber>
+                <date>20 December 2011</date>
+                <revremark>Released with Yocto Project 1.0.2 on 20 December 2011.</revremark>
+            </revision>
        </revhistory>

    <copyright>
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -60,15 +60,35 @@
                <literallayout class='monospaced'>
     meta-&lt;bsp_name&gt;
                </literallayout>
+            </para>
+
+            <para>
                "bsp_name" is a placeholder for the machine or platform name.
                Here are some example base directory names:
                <literallayout class='monospaced'>
     meta-emenlow
-     meta-intel_n450
+     meta-n450
     meta-beagleboard
                </literallayout>
            </para>

+            <para>
+                The base directory (<filename>meta-&lt;bsp_name&gt;</filename>) is the root of the BSP layer.
+                This root is what you add to the BBLAYERS variable in <filename>build/conf/bblayers.conf</filename>
+                so that the build system recognizes the BSP definition and from it can build an image.
+                Here is an example:
+                <literallayout class='monospaced'>
+     BBLAYERS = " \
+        /usr/local/src/yocto/meta \
+        /usr/local/src/yocto/meta-yocto \
+        /usr/local/src/yocto/meta-&lt;bsp_name&gt; \
+        "
+                </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 Poky Reference Manual.
+            </para>
+
            <para>
                Below is the common form for the file structure inside a base directory.
                While you can use this basic form for the standard, realize that the actual structures
@@ -162,8 +182,8 @@ meta-&lt;bsp_name&gt;/binary/&lt;bootable_images&gt;
            <para>
                This optional area contains useful pre-built kernels and user-space filesystem 
                images appropriate to the target system.
-                This directory contains the Application Development Toolkit (ADT) and minimal
-                live images when the BSP is has been "tar-balled" and placed on the Yocto Project website. 
+                This directory typically contains graphical (e.g. sato) and minimal live images 
+                when the BSP tarball has been created and made available in the Yocto Project website. 
                You can use these kernels and images to get a system running and quickly get started 
                on development tasks.
            </para>
@@ -197,7 +217,8 @@ meta-&lt;bsp_name&gt;/conf/layer.conf
 BBPATH := "${BBPATH}:${LAYERDIR}"

 # We have a recipes directory containing .bb and .bbappend files, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/recipes/*/*.bb \ ${LAYERDIR}/recipes/*/*.bbappend"
+BBFILES := "${BBFILES} ${LAYERDIR}/recipes/*/*.bb \ 
+            ${LAYERDIR}/recipes/*/*.bbappend"

 BBFILE_COLLECTIONS += "bsp"
 BBFILE_PATTERN_bsp := "^${LAYERDIR}/"
@@ -535,14 +556,14 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}"

            <para>
 	      For cases where you can substitute something and still maintain functionality, 
-              the Yocto Project website at 
-              <ulink url='http://yoctoproject.org/download/board-support-package-bsp-downloads'></ulink> 
-              will make available a 'de-featured' BSP completely free of the encumbered IP.
-              In that case you can use the substitution directly and without any further licensing
+              the Yocto Project website's  
+              <ulink url='http://www.yoctoproject.org/download/all?keys=&amp;download_type=1&amp;download_version='>BSP Download Page</ulink> 
+              makes available 'de-featured' BSPs that are completely free of any IP encumbrances.
+              For these cases you can use the substitution directly and without any further licensing
              requirements.  
-              If present, this fully 'de-featured' BSP will be named appropriately different 
-              than the normal encumbered BSP.
-              If available, this substitution is the simplest and most preferred option.
+              If present, these fully 'de-featured' BSPs are named appropriately different 
+              as compared to the names of the respective encumbered BSPs.
+              If available, these substitutions are the simplest and most preferred options.
              This, of course, assumes the resulting functionality meets requirements.
            </para>

--- a/documentation/bsp-guide/figures/poky-ref-manual.png
+++ b/documentation/bsp-guide/figures/poky-ref-manual.png
--- a/documentation/kernel-manual/Makefile
+++ b/documentation/kernel-manual/Makefile
@@ -1,42 +0,0 @@
-XSLTOPTS = --stringparam html.stylesheet style.css \
-           --stringparam  chapter.autolabel 1 \
-           --stringparam  appendix.autolabel A \
-           --stringparam  section.autolabel 1 \
-           --stringparam  section.label.includes.component.label 1 \
-         --xinclude
-
-##
-# These URI should be rewritten by your distribution's xml catalog to
-# match your localy installed XSL stylesheets.
-XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
-XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
-
-all: html pdf tarball
-
-pdf:
-	../tools/poky-docbook-to-pdf kernel-manual.xml ../template
-
-##
-# These URI should be rewritten by your distribution's xml catalog to
-# match your localy installed XSL stylesheets.
-
-html:
-#       See http://www.sagehill.net/docbookxsl/HtmlOutput.html 
-
-#	xsltproc $(XSLTOPTS) -o yocto-project-qs.html $(XSL_XHTML_URI) yocto-project-qs.xml
-	xsltproc $(XSLTOPTS) -o kernel-manual.html yocto-project-kernel-manual-customization.xsl kernel-manual.xml
-
-tarball: html
-	tar -cvzf kernel-manual.tgz kernel-manual.html kernel-manual.pdf style.css figures/kernel-title.png figures/kernel-big-picture.png figures/kernel-architecture-overview.png
-
-validate:
-	xmllint --postvalid --xinclude --noout kernel-manual.xml
-
-OUTPUTS = kernel-manual.tgz kernel-manual.html kernel-manual.pdf
-SOURCES = *.png *.xml *.css
-
-publish:
-	scp -r $(OUTPUTS) $(SOURCES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-doc/kernel-manual
-
-clean:
-	rm -f $(OUTPUTS)
--- a/documentation/kernel-manual/figures/kernel-big-picture.png
+++ b/documentation/kernel-manual/figures/kernel-big-picture.png
--- a/documentation/kernel-manual/figures/yocto-project-transp.png
+++ b/documentation/kernel-manual/figures/yocto-project-transp.png
--- a/documentation/kernel-manual/yocto-project-kernel-manual-customization.xsl
+++ b/documentation/kernel-manual/yocto-project-kernel-manual-customization.xsl
--- a/documentation/kernel-manual/kernel-manual.xml
+++ b/documentation/kernel-manual/kernel-manual.xml
@@ -39,6 +39,16 @@
                <date>6 April 2011</date>
                <revremark>This revision corresponds 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>
+            </revision>
+            <revision>
+                <revnumber>1.0.2</revnumber>
+                <date>20 December 2011</date>
+                <revremark>Released with Yocto Project 1.0.2 on 20 December 2011.</revremark>
+            </revision>
        </revhistory>

    <copyright>
--- a/documentation/poky-ref-manual/Makefile
+++ b/documentation/poky-ref-manual/Makefile
@@ -1,36 +0,0 @@
-XSLTOPTS = --stringparam html.stylesheet style.css \
-           --stringparam  chapter.autolabel 1 \
-           --stringparam  appendix.autolabel A \
-           --stringparam  section.autolabel 1 \
-           --stringparam  section.label.includes.component.label 1 \
-	   --xinclude
-
-##
-# These URI should be rewritten by your distribution's xml catalog to
-# match your localy installed XSL stylesheets.
-XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
-XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
-
-all: html pdf tarball
-
-pdf:
-	../tools/poky-docbook-to-pdf poky-ref-manual.xml ../template
-
-html:
-#       See http://www.sagehill.net/docbookxsl/HtmlOutput.html 
-	xsltproc $(XSLTOPTS) -o poky-ref-manual.html poky-ref-manual-customization.xsl poky-ref-manual.xml
-
-tarball: html
-	tar -cvzf poky-ref-manual.tgz poky-ref-manual.html style.css figures/yocto-project-transp.png figures/poky-ref-manual.png screenshots/ss-sato.png
-
-validate:
-	xmllint --postvalid --xinclude --noout poky-ref-manual.xml
-
-OUTPUTS = poky-ref-manual.tgz poky-ref-manual.html poky-ref-manual.pdf 
-SOURCES = *.png *.xml *.css *.svg
-
-publish:
-	scp -r $(OUTPUTS) $(SOURCES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-doc/poky-ref-manual
-
-clean:
-	rm -f $(OUTPUTS)
--- a/documentation/poky-ref-manual/extendpoky.xml
+++ b/documentation/poky-ref-manual/extendpoky.xml
@@ -87,7 +87,7 @@ do_install() {
                The result of the build is automatically packaged. 
                And, if the application uses NLS for localization, packages with local information are 
                generated (one package per language). 
-                Following is one example: (<filename>hello_2.2.bb</filename>)
+                Following is one example: (<filename>hello_2.3.bb</filename>)
            </para>
            <programlisting>
 DESCRIPTION = "GNU Helloworld application"
@@ -349,9 +349,9 @@ RRECOMMENDS_task-custom-tools = "\
        </section>

        <section id='usingpoky-extend-customimage-imagefeatures'>
-            <title>Customizing Images Using Custom IMAGE_FEATURES</title>
+            <title>Customizing Images Using Custom IMAGE_FEATURES and EXTRA_IMAGE_FEATURES</title>
            <para>
-                Ultimately users might want to add extra image "features" as used by Poky with the 
+                Ultimately users might want to add extra image "features" to the set used by Poky with the 
                <glossterm><link linkend='var-IMAGE_FEATURES'>IMAGE_FEATURES</link></glossterm>
                variable. 
                To create these features, the best reference is 
@@ -363,6 +363,9 @@ RRECOMMENDS_task-custom-tools = "\
                </glossterm> variable is generated automatically. 
                Users can add extra features by extending the class or creating a custom class for use 
                with specialized image <filename>.bb</filename> files.
+                You can also add more features by configuring the 
+                <glossterm><link linkend='var-EXTRA_IMAGE_FEATURES'>EXTRA_IMAGE_FEATURES</link></glossterm>
+                variable in the <filename>local.conf</filename> file.
            </para>
            <para>
                Poky ships with two SSH servers you can use in your images: Dropbear and OpenSSH. 
@@ -754,7 +757,7 @@ BBFILE_PRIORITY_emenlow = "6"
                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.pokylinux.org:8010'>poky autobuilder</ulink>
+                See <ulink url='http://autobuilder.yoctoproject.org:8010'>poky autobuilder</ulink>
                for an example implementation that uses buildbot.
            </para>
            <para>
--- a/documentation/poky-ref-manual/faq.xml
+++ b/documentation/poky-ref-manual/faq.xml
@@ -413,6 +413,57 @@
        </answer>
    </qandaentry>

+    <qandaentry>
+        <question>
+            <para>
+                Why don't you support directories with spaces in the pathnames?
+            </para>
+        </question>
+        <answer>
+            <para>
+                We have tried to do this before but too many of the tools we depend on such as autoconf 
+                break when they find spaces in pathnames.  
+                Until that situation changes we will not support spaces in pathnames.
+            </para>
+        </answer>
+    </qandaentry>
+
+    <qandaentry>
+        <question>
+            <para>
+                How do I use an external toolchain?
+            </para>
+        </question>
+        <answer>
+            <para>
+                The toolchain configuration is very flexible and customizable.
+                It is primarily controlled with the TCMODE variable.
+                This variable controls which file to include 
+                (<filename>conf/distro/include/tcmode-*.inc</filename>).
+            </para>
+            <para>
+                The default value of TCMODE is "default".
+                However, other patterns are accepted.
+                In particular, "external-*" refers to external toolchains of which there are some basic examples
+                included with the core.
+                A user can use their own custom toolchain definition in their own layer 
+                (or <filename>local.conf</filename> directory) at the location 
+                <filename>conf/distro/include/tcmode-*.inc</filename>.
+            </para>
+            <para>
+                In addition to the toolchain configuration, you also need a corresponding toolchain recipe file.
+                This recipe file needs to package up any pre-built objects in the toolchain such as 
+                <filename>libgcc</filename>, <filename>libstdcc++</filename>, 
+                any locales and <filename>libc</filename>.
+                An example is the <filename>external-csl-toolchain_2008q3-72.bb</filename>, which reuses the core 
+                <filename>libc</filename> packaging class to do most of the work.
+            </para>
+        </answer>
+    </qandaentry>
+
+
+
+
    <qandaentry>
        <question>
            <para>
--- a/documentation/poky-ref-manual/figures/cropped-yocto-project-bw.png
+++ b/documentation/poky-ref-manual/figures/cropped-yocto-project-bw.png
--- a/documentation/poky-ref-manual/figures/poky-ref-manual.png
+++ b/documentation/poky-ref-manual/figures/poky-ref-manual.png
--- a/documentation/poky-ref-manual/figures/poky-title.png
+++ b/documentation/poky-ref-manual/figures/poky-title.png
--- a/documentation/poky-ref-manual/screenshots/ss-sato.png
+++ b/documentation/poky-ref-manual/screenshots/ss-sato.png
--- a/documentation/poky-ref-manual/figures/yocto-project-transp.png
+++ b/documentation/poky-ref-manual/figures/yocto-project-transp.png
--- a/documentation/poky-ref-manual/introduction.xml
+++ b/documentation/poky-ref-manual/introduction.xml
@@ -59,7 +59,7 @@
    <screenshot>
    <mediaobject>
        <imageobject>
-            <imagedata fileref="screenshots/ss-sato.png" format="PNG" align='center' scalefit='1' width="100%" contentdepth="100%"/>
+            <imagedata fileref="figures/ss-sato.png" format="PNG" align='center' scalefit='1' width="100%" contentdepth="100%"/>
        </imageobject>
        <caption>
            <para>The Sato Desktop - A screenshot from a machine running a Poky built image</para>
--- a/documentation/poky-ref-manual/poky-ref-manual.xml
+++ b/documentation/poky-ref-manual/poky-ref-manual.xml
@@ -9,14 +9,14 @@
 
        <mediaobject>
            <imageobject>
-                <imagedata fileref='figures/poky-ref-manual.png' 
+                <imagedata fileref='figures/poky-title.png' 
                    format='SVG' 
-                    align='center' scalefit='1' width='100%'/>
+                    align='left' scalefit='1' width='100%'/>
            </imageobject>    
        </mediaobject>

-        <title>Poky Reference Manual</title>
-        <subtitle>A Guide and Reference to Poky</subtitle>
+        <title></title>
+
        <authorgroup>
            <author>
                <firstname>Richard</firstname> <surname>Purdie</surname>
@@ -52,6 +52,16 @@
                <date>6 April 2011</date>
                <revremark>Released with Yocto Project 1.0 (Bernard 5.0).</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>
+            </revision>
+            <revision>
+                <revnumber>1.0.2</revnumber>
+                <date>20 December 2011</date>
+                <revremark>Released with Yocto Project 1.0.2 on 20 December 2011.</revremark>
+            </revision>
        </revhistory>

    <copyright>
--- a/documentation/poky-ref-manual/ref-features.xml
+++ b/documentation/poky-ref-manual/ref-features.xml
@@ -211,12 +211,14 @@
        <title>Reference: Images</title>

        <para>
-            The contents of images generated by Poky can be controlled by the <glossterm
-        linkend='var-IMAGE_FEATURES'><link
-        linkend='var-IMAGE_FEATURES'>IMAGE_FEATURES</link></glossterm>
-        variable in local.conf. Through this you can add several different
-        predefined packages such as development utilities or packages with debug
-        information needed to investigate application problems or profile applications.
+            The contents of images generated by Poky can be controlled by the 
+            <glossterm linkend='var-IMAGE_FEATURES'><link linkend='var-IMAGE_FEATURES'>
+            IMAGE_FEATURES</link></glossterm> variable and the in local.conf and the 
+            <glossterm linkend='var-EXTRA_IMAGE_FEATURES'><link linkend='var-EXTRA_IMAGE_FEATURES'>
+            EXTRA_IMAGE_FEATURES</link></glossterm> that you typically configure in your image recipes.
+            Through these varibales you can add several different
+            predefined packages such as development utilities or packages with debug
+            information needed to investigate application problems or profile applications.
        </para>

        <para>
--- a/documentation/poky-ref-manual/ref-images.xml
+++ b/documentation/poky-ref-manual/ref-images.xml
@@ -20,7 +20,7 @@
        you must make the following changes in the <filename>local.conf</filename> file
        before using the BitBake command to build the minimal or base image:
        <literallayout class='monospaced'>
-     1. Comment out the IMAGE_EXTRA_FEATURES line
+     1. Comment out the EXTRA_IMAGE_FEATURES line
     2. Set INCOMPATIBLE_LICENSE = "GPLv3"
        </literallayout>
    </note>
--- a/documentation/poky-ref-manual/ref-structure.xml
+++ b/documentation/poky-ref-manual/ref-structure.xml
@@ -314,7 +314,7 @@

        <para>
            This directory receives any <filename>.rpm</filename> packages produced by Poky.  
-            The packages re sorted into feeds for different architecture types.
+            The packages are sorted into feeds for different architecture types.
        </para>
    </section>

--- a/documentation/poky-ref-manual/ref-variables.xml
+++ b/documentation/poky-ref-manual/ref-variables.xml
@@ -87,9 +87,22 @@

        <glossentry id='var-BBFILE_PRIORITY'><glossterm>BBFILE_PRIORITY</glossterm>
            <glossdef>
-                <para>Assigns different priorities to recipe files in different layers. 
-                    This variable is useful in situations where the same package might appear in multiple layers.
-                    It allows you to choose what takes precedence.</para>
+                <para>Assigns different priorities to recipe files in different layers.</para>
+                <para>This variable is useful in situations where the same package appears in
+                    more than one layer. 
+                    Setting BBFILE_PRIORITY allows you to prioritize a
+                    layer against other layers that contain the same package - effectively
+                    letting you control the precedence for the multiple layers. 
+                    The precedence established through this variable stands regardless of a
+                    layer's package version (PV variable). 
+                    For example, a layer that has a package with a higher PV value but for 
+                    which the BBFILE_PRIORITY is set to have a lower precedence still has a 
+                    lower precedence.</para>
+                <para>A larger value for the BBFILE_PRIORITY variable results in a higher
+                    precedence. 
+                    For example, the value 6 has a higher precedence than the
+                    value 5. 
+                    By default, the BBFILE_PRIORITY variable is set to the value 5.</para>
            </glossdef>
        </glossentry>

@@ -284,6 +297,49 @@
            </glossdef>
        </glossentry>

+        <glossentry id='var-EXTRA_IMAGE_FEATURES'><glossterm>EXTRA_IMAGE_FEATURES</glossterm>
+            <glossdef>
+                <para>Allows extra packages to be added to the generated images.
+                    You set this variable in the <filename>local.conf</filename>
+                    configuration file.
+                    Note that some image features are also added using the 
+                    <link linkend='var-IMAGE_FEATURES'>IMAGE_FEATURES</link>
+                    variable generally configured in image recipes.
+                    You can use the EXTRA_IMAGE_FEATURES variable to add more features
+                    in addition to those.
+                    Here are some exmaples 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.
+
+"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-debug" - Adds debugging tools such as gdb and 
+                strace.
+
+"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.
+
+"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.
+                    </literallayout> 
+
+            </glossdef>
+        </glossentry>
+
        <glossentry id='var-EXTRA_OECMAKE'><glossterm>EXTRA_OECMAKE</glossterm>
            <glossdef>
                <para>Additional cmake options</para>
@@ -343,7 +399,11 @@
        <glossentry id='var-IMAGE_FEATURES'><glossterm>IMAGE_FEATURES</glossterm>
            <glossdef>
                <para><link linkend="ref-features-image">List of
-                features</link> present in resulting images</para>
+                features</link> present in resulting images.
+                Typically you configure this variable in image recipes.
+                Note that you can add extra features to the image by using the
+                <link linkend='var-EXTRA_IMAGE_FEATURES'>EXTRA_IMAGE_FEATURES</link>
+                variable.</para>
            </glossdef>
        </glossentry>

--- a/documentation/poky-ref-manual/ref-varlocality.xml
+++ b/documentation/poky-ref-manual/ref-varlocality.xml
@@ -97,7 +97,7 @@
                <para><glossterm linkend='var-BBFILES'><link linkend='var-BBFILES'>BBFILES</link></glossterm></para>
            </listitem>
            <listitem>
-                <para><glossterm linkend='var-IMAGE_FEATURES'><link linkend='var-IMAGE_FEATURES'>IMAGE_FEATURES</link></glossterm></para>
+                <para><glossterm linkend='var-EXTRA_IMAGE_FEATURES'><link linkend='var-EXTRA_IMAGE_FEATURES'>EXTRA_IMAGE_FEATURES</link></glossterm></para>
            </listitem>
            <listitem>
                <para><glossterm linkend='var-PACKAGE_CLASSES'><link linkend='var-PACKAGE_CLASSES'>PACKAGE_CLASSES</link></glossterm></para>
--- a/documentation/poky-ref-manual/resources.xml
+++ b/documentation/poky-ref-manual/resources.xml
@@ -74,10 +74,11 @@
            <ulink url='http://yoctoproject.org'>The Yocto Project website</ulink> - The home site
            for Yocto Project.
        </para></listitem>
-        <listitem><para>
+<!--        <listitem><para>
            <ulink url='http://pokylinux.org'>The Poky website</ulink> - The home site
            for Poky Linux.
        </para></listitem>
+-->
        <listitem><para>
            <ulink url='http://www.openedhand.com/'>OpenedHand</ulink> - The
            original company behind Poky.
--- a/documentation/poky-ref-manual/screenshots/ss-anjuta-poky-1.png
+++ b/documentation/poky-ref-manual/screenshots/ss-anjuta-poky-1.png
--- a/documentation/poky-ref-manual/screenshots/ss-anjuta-poky-2.png
+++ b/documentation/poky-ref-manual/screenshots/ss-anjuta-poky-2.png
--- a/documentation/poky-ref-manual/screenshots/ss-oprofile-viewer.png
+++ b/documentation/poky-ref-manual/screenshots/ss-oprofile-viewer.png
--- a/documentation/poky-ref-manual/style.css
+++ b/documentation/poky-ref-manual/style.css
@@ -122,13 +122,13 @@ h6 {
  background-color: transparent;
  background-repeat: no-repeat;
  padding-top: 256px;
-  background-image: url("figures/poky-ref-manual.png");
+  background-image: url("figures/poky-title.png");
  background-position: left top;
  margin-top: -256px;
  padding-right: 50px;
-  margin-left: 50px;
+  margin-left: 0px;
  text-align: right;
-  width: 600px;
+  width: 740px;
 }

 h3.author {
@@ -771,12 +771,22 @@ h6,
 h7{
 }

+/*
+Example of how to stick an image as part of the title.
+
+div.article .titlepage .title
+{
+  background-image: url("figures/white-on-black.png");
+  background-position: center;
+  background-repeat: repeat-x;
+}
+*/
+
 div.preface .titlepage .title, 
 div.colophon .title, 
-div.chapter .titlepage .title {
-  background-image: url("images/title-bg.png");
-  background-position: bottom;
-  background-repeat: repeat-x;
+div.chapter .titlepage .title,
+div.article .titlepage .title 
+{
 }

 div.section div.section .titlepage .title,
@@ -787,7 +797,7 @@ div.sect2 .titlepage .title {

 h1.title {
  background-color: transparent;
-  background-image: url("poky-ref-manual.png");
+  background-image: url("figures/poky-title.png");
  background-repeat: no-repeat;
  height: 256px;
  text-indent: -9000px;
--- a/documentation/poky-ref-manual/usingpoky.xml
+++ b/documentation/poky-ref-manual/usingpoky.xml
@@ -73,6 +73,14 @@
            So for example, before building <filename>matchbox-desktop</filename> BitBake
            would build a cross compiler and glibc if they had not already been built.
        </para>
+        <para>
+            A useful BitBake option to consider is the <filename>-k</filename> or 
+            <filename>&dash;&dash;continue</filename> option.  
+            This option instructs BitBake to try and continue processing the job as much 
+            as possible even after encountering an error.  When an error occurs the target that
+            failed and those that depend on it cannot be remade.  However, when you use this
+            option other dependencies can still be processed.
+        </para>

    </section>

--- a/documentation/yocto-project-qs/Makefile
+++ b/documentation/yocto-project-qs/Makefile
@@ -1,32 +0,0 @@
-XSLTOPTS = --stringparam html.stylesheet style.css \
-         --xinclude
-
-XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
-XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
-
-all: html tarball
-
-##
-# These URI should be rewritten by your distribution's xml catalog to
-# match your localy installed XSL stylesheets.
-
-html:
-#       See http://www.sagehill.net/docbookxsl/HtmlOutput.html 
-
-#	xsltproc $(XSLTOPTS) -o yocto-project-qs.html $(XSL_XHTML_URI) yocto-project-qs.xml
-	xsltproc $(XSLTOPTS) -o yocto-project-qs.html yocto-project-qs-customization.xsl yocto-project-qs.xml
-
-tarball: html
-	tar -cvzf yocto-project-qs.tgz yocto-project-qs.html ypqs.pdf style.css figures/yocto-environment.png figures/building-an-image.png figures/using-a-pre-built-image.png figures/yocto-project-transp.png
-
-validate:
-	xmllint --postvalid --xinclude --noout yocto-project-qs.xml
-
-OUTPUTS = yocto-project-qs.tgz yocto-project-qs.html ypqs.pdf
-SOURCES = *.png *.xml *.css
-
-publish:
-	scp -r $(OUTPUTS) $(SOURCES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-doc/yocto-quick-start
-
-clean:
-	rm -f $(OUTPUTS)
--- a/documentation/yocto-project-qs/figures/cropped-yocto-project-bw.png
+++ b/documentation/yocto-project-qs/figures/cropped-yocto-project-bw.png
--- a/documentation/yocto-project-qs/figures/white-on-black.png
+++ b/documentation/yocto-project-qs/figures/white-on-black.png
--- a/documentation/yocto-project-qs/figures/yocto-environment.png
+++ b/documentation/yocto-project-qs/figures/yocto-environment.png
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -47,7 +47,7 @@
        The Yocto Project through the Poky build tool provides an open source development 
        environment targeting the ARM, MIPS, PowerPC and x86 architectures for a variety of 
        platforms including x86-64 and emulated ones.
-        You can use components from the the Yocto Project to design, develop, build, debug, simulate,
+        You can use components from the Yocto Project to design, develop, build, debug, simulate,
        and test the complete software stack using Linux, the X Window System, GNOME Mobile-based
        application frameworks, and Qt frameworks.
    </para>
@@ -188,10 +188,15 @@
        <title>Yocto Project Release</title>
            
        <para>
-            The latest release images for the Yocto Project are kept at 
-            <ulink url="http://yoctoproject.org/downloads/yocto-1.0/"></ulink>.
-            Nightly and developmental builds are also maintained.  However, for this 
-            document a released version of Yocto Project is used.
+            You can download the latest release images for the Yocto Project on 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. 
+            Then, click the "Yocto Release" link for the release you want from the list to 
+            begin the download. 
+            Nightly and developmental builds are also maintained at
+            <ulink url="http://autobuilder.yoctoproject.org/nightly/"></ulink>.  
+            However, for this document a released version of Yocto Project is used.
        </para>
    </section>
 </section>
@@ -253,9 +258,9 @@

         <para>
             <literallayout class='monospaced'>
-     $ wget http://www.yoctoproject.org/downloads/poky/poky-bernard-5.0.tar.bz2
-     $ tar xjf poky-bernard-5.0.tar.bz2
-     $ source poky-bernard-5.0/poky-init-build-env poky-5.0-build
+     $ wget http://www.yoctoproject.org/downloads/poky/poky-bernard-5.0.2.tar.bz2
+     $ tar xjf poky-bernard-5.0.2.tar.bz2
+     $ source poky-bernard-5.0.2/poky-init-build-env poky-5.0.2-build
             </literallayout>
         </para>

@@ -273,8 +278,8 @@
             <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-build</filename> directory and executes the <command>cd</command>
-             command to make <filename>poky-5.0-build</filename> the working directory.
+             <filename>poky-5.0.2-build</filename> directory and executes the <command>cd</command>
+             command to make <filename>poky-5.0.2-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 
@@ -290,8 +295,12 @@
         <para>
             Continue with the following command to build an OS image for the target, which is 
             <filename>poky-image-sato</filename> in this example.
+             For information on the <filename>&dash;k</filename> option use the 
+             <filename>bitbake &dash;&dash;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 Poky Reference Manual.
             <literallayout class='monospaced'>
-     $ bitbake poky-image-sato
+     $ bitbake -k poky-image-sato
             </literallayout>
             <note><para>
                 BitBake requires Python 2.6.  For more information on this requirement, 
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -763,6 +763,7 @@ python do_package_rpm () {
 	targetsys = bb.data.getVar('TARGET_SYS', d, True)
 	pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d)
 	pkgarch = bb.data.expand('${PACKAGE_ARCH}', d)
+	magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d)
 	bb.mkdirhier(pkgwritedir)
 	os.chmod(pkgwritedir, 0755)

@@ -775,6 +776,7 @@ python do_package_rpm () {
 	cmd = cmd + " --define '__find_provides " + outprovides + "'"
 	cmd = cmd + " --define '_unpackaged_files_terminate_build 0'"
 	cmd = cmd + " --define 'debug_package %{nil}'"
+	cmd = cmd + " --define '_rpmfc_magic_path " + magicfile + "'"
 	cmd = cmd + " -bb " + outspecfile

 	# Build the rpm package!
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -86,17 +86,17 @@ SRCREV_pn-linux-omap-zoomsync ??= "015cbaf1035cd9a61d33a27de2a22902555db3c5"
 SRCREV_pn-linux-omap2 ??= "d3b3ae0fe6c71641da19c8de466ec366d39847e3"
 SRCREV_pn-linux-omap3 ??= "de1121fdb899f762b9e717f44eaf3fae7c00cd3e"
 SRCREV_pn-linux-omap3-pm ??= "totallybroken"
-SRCREV_machine_pn-linux-yocto-stable_qemuarm ?= "a2fb081b44d6368eff8d28e2fdb991c61b1f428e"
-SRCREV_machine_pn-linux-yocto-stable_qemumips ?= "c32d40f960e3c89d07f079bec4c96dcbfc749f0b"
-SRCREV_machine_pn-linux-yocto-stable_qemuppc ?= "96d6bc31d3caaf62a966255479cc5cee0e76b1e9"
-SRCREV_machine_pn-linux-yocto-stable_qemux86 ?= "72ca49ab08b8eb475cec82a10049503602325791"
-SRCREV_machine_pn-linux-yocto-stable_qemux86-64 ?= "72ca49ab08b8eb475cec82a10049503602325791"
-SRCREV_machine_pn-linux-yocto-stable_atom-pc ?= "72ca49ab08b8eb475cec82a10049503602325791"
-SRCREV_machine_pn-linux-yocto-stable_routerstationpro ?= "49745cd45c92a89e70c6e2334caa80818c134562"
-SRCREV_machine_pn-linux-yocto-stable_mpc8315e-rdb ?= "a1c0ed6bf4060c10874b2a8547d81b3169dcf16a"
-SRCREV_machine_pn-linux-yocto-stable_beagleboard ?= "ef7f944e773950d4016b7643f9ecf052bbe250cd"
-SRCREV_machine_pn-linux-yocto-stable ?= "72ca49ab08b8eb475cec82a10049503602325791"
-SRCREV_meta_pn-linux-yocto-stable ?= "e1f85a470934a0cf6abde5d95533e74501822c6b"
+SRCREV_machine_pn-linux-yocto-stable_qemuarm ?= "24305dfe5a7c4eadb0160b565442991c2a4598e6"
+SRCREV_machine_pn-linux-yocto-stable_qemumips ?= "872453662305b0c14cc87480f7c96168ff36481e"
+SRCREV_machine_pn-linux-yocto-stable_qemuppc ?= "11affb88242d373b5bf4039b771e3872b428e3d2"
+SRCREV_machine_pn-linux-yocto-stable_qemux86 ?= "adea8c9cce0ffff0f10abe3257382c1190f0f569"
+SRCREV_machine_pn-linux-yocto-stable_qemux86-64 ?= "adea8c9cce0ffff0f10abe3257382c1190f0f569"
+SRCREV_machine_pn-linux-yocto-stable_atom-pc ?= "adea8c9cce0ffff0f10abe3257382c1190f0f569"
+SRCREV_machine_pn-linux-yocto-stable_routerstationpro ?= "4e8cefebccb235de37199a7644a89ead1fc0b2fa"
+SRCREV_machine_pn-linux-yocto-stable_mpc8315e-rdb ?= "9bf8e1497b853a5d556e94febf8185c380e6a2d3"
+SRCREV_machine_pn-linux-yocto-stable_beagleboard ?= "f3e11c02c4d62d9a3c00abd2048c0b6cf007d988"
+SRCREV_machine_pn-linux-yocto-stable ?= "adea8c9cce0ffff0f10abe3257382c1190f0f569"
+SRCREV_meta_pn-linux-yocto-stable ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a"
 # development SRCREVs
 SRCREV_machine_pn-linux-yocto_qemuarm ?= "233213a1e09eae3de7047ff406b156608788ec17"
 SRCREV_machine_pn-linux-yocto_qemumips ?= "54bb956f70349923af29f28a4f9471f5658e1787"
@@ -180,7 +180,7 @@ SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
 SRCREV_pn-ubootchart ??= "10"
 SRCREV_pn-webkit-gtk ??= "72836"
 SRCREV_pn-web-webkit ??= "130"
-SRCREV_pn-web ??= "131"
+SRCREV_pn-web ??= "8adaf105a0cbfd835ea5d3915d7dee22586208e7"
 SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
 SRCREV_pn-xcb-proto-native ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
 SRCREV_pn-xf86-video-intel ??= "87ea531c5dc5b39809395b277c330854aaaaf019"
@@ -198,4 +198,4 @@ SRCDATE_yaffs2-utils-native ??= "20071107"
 SRCDATE_yaffs2-utils ??= "20071107"
 SRCREV_pn-zaurusd ??= "426"
 SRCREV_pn-zypper ??= "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582"
-
+SRCREV_pn-u-boot ??= "19b54a701811220221fc4d5089a2bb18892018ca"
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -2,8 +2,8 @@
 #@DESCRIPTION: Distribution configuration for the Yocto Project build by Poky

 DISTRO = "poky"
-DISTRO_NAME = "Yocto (Built by Poky 5.0.1)"
-DISTRO_VERSION = "1.0.1"
+DISTRO_NAME = "Yocto (Built by Poky 5.0.2)"
+DISTRO_VERSION = "1.0.2"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"

 MAINTAINER = "Poky <poky@yoctoproject.org>"
@@ -153,17 +153,17 @@ BB_GENERATE_MIRROR_TARBALLS ??= "0"
 require conf/distro/include/world-broken.inc

 PREMIRRORS ?= "\
-bzr://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
-cvs://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
-git://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
-hg://.*/.*    http://autobuilder.yoctoproject.org/sources/ \n \
-osc://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
-p4://.*/.*    http://autobuilder.yoctoproject.org/sources/ \n \
-svk://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
-svn://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n"
+bzr://.*/.*   http://downloads.yoctoproject.org/releases/yocto/yocto-1.0/sources/ \n \
+cvs://.*/.*   http://downloads.yoctoproject.org/releases/yocto/yocto-1.0/sources/ \n \
+git://.*/.*   http://downloads.yoctoproject.org/releases/yocto/yocto-1.0/sources/ \n \
+hg://.*/.*    http://downloads.yoctoproject.org/releases/yocto/yocto-1.0/sources/ \n \
+osc://.*/.*   http://downloads.yoctoproject.org/releases/yocto/yocto-1.0/sources/ \n \
+p4://.*/.*    http://downloads.yoctoproject.org/releases/yocto/yocto-1.0/sources/ \n \
+svk://.*/.*   http://downloads.yoctoproject.org/releases/yocto/yocto-1.0/sources/ \n \
+svn://.*/.*   http://downloads.yoctoproject.org/releases/yocto/yocto-1.0/sources/ \n"

 MIRRORS =+ "\
-ftp://.*/.*      http://autobuilder.yoctoproject.org/sources/ \n \
-http://.*/.*     http://autobuilder.yoctoproject.org/sources/ \n \
-https://.*/.*    http://autobuilder.yoctoproject.org/sources/ \n"
+ftp://.*/.*      http://downloads.yoctoproject.org/releases/yocto/yocto-1.0/sources/ \n \
+http://.*/.*     http://downloads.yoctoproject.org/releases/yocto/yocto-1.0/sources/ \n \
+https://.*/.*    http://downloads.yoctoproject.org/releases/yocto/yocto-1.0/sources/ \n"

--- a/meta/recipes-bsp/uboot/u-boot_git.bb
+++ b/meta/recipes-bsp/uboot/u-boot_git.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \

 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE}"

-SRCREV = "v2011.03"
 PV = "v2011.03+git${SRCPV}"
 PR="r3"

--- a/meta/recipes-bsp/zaurusd/zaurusd/fix_makefile.patch
+++ b/meta/recipes-bsp/zaurusd/zaurusd/fix_makefile.patch
@@ -0,0 +1,19 @@
+Upstream-Status: Pending
+
+Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10
+Fix following build error:
+
+| Makefile:716: *** missing separator (did you mean TAB instead of 8 spaces?).  Stop.
+| ERROR: oe_runmake failed
+
+Index: zaurusd/Makefile.am
+===================================================================
+--- zaurusd.orig/Makefile.am
+++ zaurusd/Makefile.am
+@@ -4,5 +4,5 @@ SUBDIRS = apps config scripts
+ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+ 
--- a/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
+++ b/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
@@ -5,9 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "tslib"
 RDEPENDS_${PN} = "xrandr"
 PV = "0.0+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"

-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
+	file://fix_makefile.patch"

 S = "${WORKDIR}/${PN}"

--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -28,7 +28,7 @@ inherit autotools pkgconfig gettext
 S = "${WORKDIR}/glib-${PV}"

 EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
-EXTRA_OECONF_virtclass-native = ""
+EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap"
 EXTRA_OECONF_poky-lsb = "--enable-included-printf=no"

 FILES_${PN} = "${libdir}/lib*${SOLIBS}"
--- a/meta/recipes-devtools/python/python/07-linux3-regen-fix.patch
+++ b/meta/recipes-devtools/python/python/07-linux3-regen-fix.patch
@@ -0,0 +1,18 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Without this patch it calls cross-compiled python if host is running linux-3.0
+python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
+| ./regen: line 3: /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-2.6.6-nk2.8/Python-2.6.6/python: cannot execute binary file
+
+diff -uNr Python-2.6.6.orig//Lib/plat-linux3/regen Python-2.6.6/Lib/plat-linux3/regen
+--- Python-2.6.6.orig//Lib/plat-linux3/regen	1970-01-01 01:00:00.000000000 +0100
+++ Python-2.6.6/Lib/plat-linux3/regen	2001-08-09 14:48:17.000000000 +0200
+@@ -0,0 +1,8 @@
+#! /bin/sh
+case `uname` in
+Linux*)	;;
+*)	echo Probably not on a Linux system 1>&2
+	exit 1;;
+esac
+set -v
+h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/dlfcn.h
--- a/meta/recipes-devtools/python/python/fix-cgi-http-server.patch
+++ b/meta/recipes-devtools/python/python/fix-cgi-http-server.patch
@@ -0,0 +1,176 @@
+This patch is taken from upstream and is a fix for CVE CVE-2011-1015
+
+Upstream-Status: Backport
+
+Signed-off-by: Joshua Lock <josh@linux.intel.com>
+
+# HG changeset patch
+# User Gregory P. Smith <greg@mad-scientist.com>
+# Date 1238999606 0
+# Node ID c6c4398293bd682b355f1050bb16bb3e18c8b40f
+# Parent  e363958fcd70a43ad07b39df999552d0fa1cefc1
+- Issue #2254: Fix CGIHTTPServer information disclosure.  Relative paths are
+  now collapsed within the url properly before looking in cgi_directories.
+
+Index: Python-2.6.6/Lib/CGIHTTPServer.py
+===================================================================
+--- Python-2.6.6.orig/Lib/CGIHTTPServer.py	2009-11-11 09:24:53.000000000 -0800
+++ Python-2.6.6/Lib/CGIHTTPServer.py	2011-10-13 13:51:33.815347721 -0700
+@@ -70,27 +70,20 @@
+             return SimpleHTTPServer.SimpleHTTPRequestHandler.send_head(self)
+ 
+     def is_cgi(self):
+-        """Test whether self.path corresponds to a CGI script,
+-        and return a boolean.
+        """Test whether self.path corresponds to a CGI script.
+ 
+-        This function sets self.cgi_info to a tuple (dir, rest)
+-        when it returns True, where dir is the directory part before
+-        the CGI script name.  Note that rest begins with a
+-        slash if it is not empty.
+-
+-        The default implementation tests whether the path
+-        begins with one of the strings in the list
+-        self.cgi_directories (and the next character is a '/'
+-        or the end of the string).
+        Returns True and updates the cgi_info attribute to the tuple
+        (dir, rest) if self.path requires running a CGI script.
+        Returns False otherwise.
+
+        The default implementation tests whether the normalized url
+        path begins with one of the strings in self.cgi_directories
+        (and the next character is a '/' or the end of the string).
+         """
+-
+-        path = self.path
+-
+-        for x in self.cgi_directories:
+-            i = len(x)
+-            if path[:i] == x and (not path[i:] or path[i] == '/'):
+-                self.cgi_info = path[:i], path[i+1:]
+-                return True
+        splitpath = _url_collapse_path_split(self.path)
+        if splitpath[0] in self.cgi_directories:
+            self.cgi_info = splitpath
+            return True
+         return False
+ 
+     cgi_directories = ['/cgi-bin', '/htbin']
+@@ -299,6 +292,46 @@
+                 self.log_message("CGI script exited OK")
+ 
+ 
+# TODO(gregory.p.smith): Move this into an appropriate library.
+def _url_collapse_path_split(path):
+    """
+    Given a URL path, remove extra '/'s and '.' path elements and collapse
+    any '..' references.
+
+    Implements something akin to RFC-2396 5.2 step 6 to parse relative paths.
+
+    Returns: A tuple of (head, tail) where tail is everything after the final /
+    and head is everything before it.  Head will always start with a '/' and,
+    if it contains anything else, never have a trailing '/'.
+
+    Raises: IndexError if too many '..' occur within the path.
+    """
+    # Similar to os.path.split(os.path.normpath(path)) but specific to URL
+    # path semantics rather than local operating system semantics.
+    path_parts = []
+    for part in path.split('/'):
+        if part == '.':
+            path_parts.append('')
+        else:
+            path_parts.append(part)
+    # Filter out blank non trailing parts before consuming the '..'.
+    path_parts = [part for part in path_parts[:-1] if part] + path_parts[-1:]
+    if path_parts:
+        tail_part = path_parts.pop()
+    else:
+        tail_part = ''
+    head_parts = []
+    for part in path_parts:
+        if part == '..':
+            head_parts.pop()
+        else:
+            head_parts.append(part)
+    if tail_part and tail_part == '..':
+        head_parts.pop()
+        tail_part = ''
+    return ('/' + '/'.join(head_parts), tail_part)
+
+
+ nobody = None
+ 
+ def nobody_uid():
+Index: Python-2.6.6/Lib/test/test_httpservers.py
+===================================================================
+--- Python-2.6.6.orig/Lib/test/test_httpservers.py	2010-04-25 15:09:32.000000000 -0700
+++ Python-2.6.6/Lib/test/test_httpservers.py	2011-10-13 13:51:33.815347721 -0700
+@@ -7,6 +7,7 @@
+ from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+ from SimpleHTTPServer import SimpleHTTPRequestHandler
+ from CGIHTTPServer import CGIHTTPRequestHandler
+import CGIHTTPServer
+ 
+ import os
+ import sys
+@@ -324,6 +325,45 @@
+         finally:
+             BaseTestCase.tearDown(self)
+ 
+    def test_url_collapse_path_split(self):
+        test_vectors = {
+            '': ('/', ''),
+            '..': IndexError,
+            '/.//..': IndexError,
+            '/': ('/', ''),
+            '//': ('/', ''),
+            '/\\': ('/', '\\'),
+            '/.//': ('/', ''),
+            'cgi-bin/file1.py': ('/cgi-bin', 'file1.py'),
+            '/cgi-bin/file1.py': ('/cgi-bin', 'file1.py'),
+            'a': ('/', 'a'),
+            '/a': ('/', 'a'),
+            '//a': ('/', 'a'),
+            './a': ('/', 'a'),
+            './C:/': ('/C:', ''),
+            '/a/b': ('/a', 'b'),
+            '/a/b/': ('/a/b', ''),
+            '/a/b/c/..': ('/a/b', ''),
+            '/a/b/c/../d': ('/a/b', 'd'),
+            '/a/b/c/../d/e/../f': ('/a/b/d', 'f'),
+            '/a/b/c/../d/e/../../f': ('/a/b', 'f'),
+            '/a/b/c/../d/e/.././././..//f': ('/a/b', 'f'),
+            '../a/b/c/../d/e/.././././..//f': IndexError,
+            '/a/b/c/../d/e/../../../f': ('/a', 'f'),
+            '/a/b/c/../d/e/../../../../f': ('/', 'f'),
+            '/a/b/c/../d/e/../../../../../f': IndexError,
+            '/a/b/c/../d/e/../../../../f/..': ('/', ''),
+        }
+        for path, expected in test_vectors.iteritems():
+            if isinstance(expected, type) and issubclass(expected, Exception):
+                self.assertRaises(expected,
+                                  CGIHTTPServer._url_collapse_path_split, path)
+            else:
+                actual = CGIHTTPServer._url_collapse_path_split(path)
+                self.assertEquals(expected, actual,
+                                  msg='path = %r\nGot:    %r\nWanted: %r' % (
+                                  path, actual, expected))
+
+     def test_headers_and_content(self):
+         res = self.request('/cgi-bin/file1.py')
+         self.assertEquals(('Hello World\n', 'text/html', 200), \
+@@ -348,6 +388,12 @@
+         self.assertEquals(('Hello World\n', 'text/html', 200), \
+              (res.read(), res.getheader('Content-type'), res.status))
+ 
+    def test_no_leading_slash(self):
+        # http://bugs.python.org/issue2254
+        res = self.request('cgi-bin/file1.py')
+        self.assertEquals(('Hello World\n', 'text/html', 200),
+             (res.read(), res.getheader('Content-type'), res.status))
+
+ 
+ def test_main(verbose=None):
+     cwd = os.getcwd()
--- a/meta/recipes-devtools/python/python_2.6.6.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.bb
@@ -1,7 +1,7 @@
 require python.inc
 DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"

 DISTRO_SRC_URI ?= "file://sitecustomize.py"
@@ -15,7 +15,9 @@ SRC_URI = "\
  file://05-enable-ctypes-cross-build.patch \
  file://06-ctypes-libffi-fix-configure.patch \
  file://06-avoid_usr_lib_termcap_path_in_linking.patch \
+  file://07-linux3-regen-fix.patch \
  file://99-ignore-optimization-flag.patch \
+  file://fix-cgi-http-server.patch \
  ${DISTRO_SRC_URI} \
 "

--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -15,6 +15,7 @@ do_configure_prepend_virtclass-native() {

    test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes'
    test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes'
+    test -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so && libgl='yes'

    test -e /usr/lib/pkgconfig/sdl.pc -o -e /usr/lib64/pkgconfig/sdl.pc -o -e /usr/include/SDL/SDL.h && libsdl='yes'

--- a/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
+++ b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
@@ -0,0 +1,26 @@
+Upstream-Status: Pending
+
+the test should be skipped for cross compiling.
+
+Signed-off-by: Qing He <qing.he@intel.com>
+
+diff --git a/configure.ac b/configure.ac
+index 026a36c..8af591b 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -245,6 +245,7 @@ fi
+ QUILT_COMPAT_PROG_PATH(DIFF, diff)
+ QUILT_COMPAT_PROG_PATH(PATCH, patch)
+ 
+if test "x$cross_compiling" != "xyes"; then
+ # Sun diff and others will not work because GNU patch options are used.
+ AC_MSG_CHECKING([the version of $DIFF])
+ if $DIFF --version 2>/dev/null | grep GNU >/dev/null; then
+@@ -293,6 +294,7 @@ current version of patch from ftp.gnu.org, or if you already have GNU patch
+ then you can supply its path with the '--with-patch=' option.
+ ])
+ fi
+fi
+ 
+ QUILT_COMPAT_PROG_PATH(FIND, find)
+ 
--- a/meta/recipes-devtools/quilt/quilt_0.48.bb
+++ b/meta/recipes-devtools/quilt/quilt_0.48.bb
@@ -2,8 +2,10 @@ require quilt.inc
 LICENSE="GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
-PR = "r0"
-SRC_URI += "file://aclocal.patch"
+PR = "r1"
+SRC_URI += "file://aclocal.patch \
+            file://gnu_patch_test_fix_target.patch \
+           "

 SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
 SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
--- a/meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/fprint-pointer-fix.patch
@@ -0,0 +1,35 @@
+Upstream-Status: Submitted
+
+From: Qing He <qing.he@intel.com>
+Subject: [PATCH] rpm 5.4.0: Fix pointer mishandling
+
+In fpLookupSubdir, data returned by hash should be of type
+"struct rpmffi_s **" instead of "struct rpmffi_s *" to avoid
+segfault.
+
+Signed-off-by: Qing He <qing.he@intel.com>
+
+diff --git a/rpmdb/fprint.c b/rpmdb/fprint.c
+index 0e76148..82b8f45 100644
+--- a/rpmdb/fprint.c
+++ b/rpmdb/fprint.c
+@@ -333,7 +333,7 @@ restart:
+     *te = '\0';
+ 
+     while (te < se) {
+-	struct rpmffi_s * recs;
+	struct rpmffi_s ** recs;
+ 	int numRecs;
+ 	int i;
+ 
+@@ -346,8 +346,8 @@ restart:
+ 	    const char * link;
+ 	    int fx;
+ 
+-	    fx = recs[i].fileno;
+-	    fi =  recs[i].p->fi;
+	    fx = recs[i]->fileno;
+	    fi =  recs[i]->p->fi;
+ 	    flink = fi->flinks[fx];
+ 	    if (!(flink && *flink != '\0'))
+ 		continue;
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -43,7 +43,7 @@ LICENSE = "LGPL 2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"

 DEPENDS = "bzip2 zlib python perl db openssl elfutils expat libpcre attr acl popt"
-PR = "r15"
+PR = "r16"

 # 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...
@@ -57,6 +57,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
 	   file://rpm-nofsync.patch \
 	   file://rpm-solvedb.patch \
 	   file://rpm-tools-mtree-LDFLAGS.patch \
+	   file://fprint-pointer-fix.patch \
 	  "

 #           file://hdraddorappend.patch \
--- a/meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_unsupporting_kernel_3.patch
+++ b/meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_unsupporting_kernel_3.patch
@@ -0,0 +1,26 @@
+valgrind: Add 3.x statements to "case" for supporting the kernel 3.x
+
+Signed-off-by: Lin Tong <tong.lin@intel.com>
+
+Upstream-Status: Pending
+
+diff --git a/configure.in b/configure.in
+index 3878619..1cb7dc7 100644
+--- a/configure.in
+++ b/configure.in
+@@ -229,10 +229,14 @@ case "${host_os}" in
+         	    AC_MSG_RESULT([2.4 family (${kernel})])
+         	    AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you're using Linux 2.4.x])
+         	    ;;
+             3.*)
+                    AC_MSG_RESULT([3 family (${kernel})])
+                    AC_DEFINE([KERNEL_3], 1, [Define to 1 if you're using Linux 3.x])
+                    ;;
+ 
+              *) 
+         	    AC_MSG_RESULT([unsupported (${kernel})])
+-        	    AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6])
+        	    AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6, 3.x])
+         	    ;;
+         esac
+ 
--- a/meta/recipes-devtools/valgrind/valgrind_3.6.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.6.0.bb
@@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
                    file://include/valgrind.h;beginline=1;endline=56;md5=13a71cedba99112334d8596162aec37e \
                    file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215"
 DEPENDS = "virtual/libx11"
-PR = "r0"
+PR = "r1"

 SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
 	   file://fix_issue_caused_by_ccache.patch \
-           file://fixed-perl-path.patch"
+           file://fixed-perl-path.patch \
+	   file://fix_unsupporting_kernel_3.patch"

 SRC_URI[md5sum] = "b289c5f4ab8e39741602445f1dd09b34"
 SRC_URI[sha256sum] = "bc0f0153b5a47b986f1d8efa2c488e0aea85a1cf2c4b11c52be127903080285f"
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/disable-native-tools.patch
+++ b/meta/recipes-extended/texinfo/texinfo-4.13a/disable-native-tools.patch
@@ -0,0 +1,43 @@
+We already DEPEND on the native texinfo being present before building so
+there isn't any need to try and build the required native texinfo binaries
+before cross-compiling. This simplifies the recipe somewhat!
+
+Upstream-Status: Inappropriate oe specific
+
+Signed-off-by: Joshua Lock <josh@linux.intel.com>
+
+Index: texinfo-4.13/configure.ac
+===================================================================
+--- texinfo-4.13.orig/configure.ac
+++ texinfo-4.13/configure.ac
+@@ -100,29 +100,7 @@ AC_CANONICAL_BUILD
+ # $native_tools is also added to SUBDIRS in the main Makefile.am,
+ # so that make compiles the native tools first.
+ #
+-if test "$cross_compiling" = no; then
+-  native_tools=
+-else
+-  native_tools=tools
+-  test -d "$native_tools" || mkdir "$native_tools"
+-  confdir=`(cd "$srcdir";pwd)`
+-  # Make sure the secondary configure won't fail with
+-  # "error: source directory already configured".
+-  rm -f config.status
+-  AC_MSG_NOTICE([[Doing configure of native tools (${build}).]])
+-  cd "$native_tools" || exit 1
+-  # Run secondary configure in alternate environment or
+-  # it gets the wrong CC etc.
+-  # env -i gives this build host configure a clean environment;
+-  # consequently, we have to re-initialize $PATH.
+-  env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \
+-      PATH="$PATH" \
+-      tools_only=1 \
+-    ${confdir}/configure --build=${build} --host=${build} \
+-                         --disable-rpath --disable-nls
+-  cd .. || exit 1
+-  AC_MSG_NOTICE([[Continuing with main configure (${host}).]])
+-fi
+native_tools=
+ AC_SUBST(native_tools)
+ AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])
+ 
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch
+++ b/meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch
@@ -0,0 +1,16 @@
+install-info uses symbols from zlib so must link against it.
+
+Upstream-Status: Pending
+
+Signed-off-by: Joshua Lock <josh@linux.intel.com>
+
+Index: texinfo-4.13/install-info/Makefile.am
+===================================================================
+--- texinfo-4.13.orig/install-info/Makefile.am
+++ texinfo-4.13/install-info/Makefile.am
+@@ -28,4 +28,4 @@ AM_CPPFLAGS = 					\
+   -I$(top_srcdir)/gnulib/lib			\
+   -I$(top_builddir)/gnulib/lib			\
+   -DLOCALEDIR=\"$(localedir)\"
+-LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
+LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) -lz
--- a/meta/recipes-extended/texinfo/texinfo_4.13a.bb
+++ b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
@@ -9,14 +9,17 @@ LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010"
 PR = "r0"

-DEPENDS = "zlib"
+DEPENDS = "zlib ncurses texinfo-native"
+DEPENDS_virtclass-native = "zlib-native ncurses-native"

 SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \
-           file://texinfo-4.12-zlib.patch;striplevel=1 \
-           file://texinfo-4.13a-data_types.patch;striplevel=1 \
-           file://texinfo-4.13a-mosdo-crash.patch;striplevel=1 \
-           file://texinfo-4.13a-powerpc.patch;striplevel=1 \
-           file://texinfo-4.13a-help-index-segfault.patch;striplevel=1"
+           file://texinfo-4.12-zlib.patch \
+           file://texinfo-4.13a-data_types.patch \
+           file://texinfo-4.13a-mosdo-crash.patch \
+           file://texinfo-4.13a-powerpc.patch \
+           file://texinfo-4.13a-help-index-segfault.patch \
+           file://disable-native-tools.patch \
+           file://link-zip.patch"

 SRC_URI[md5sum] = "71ba711519209b5fb583fed2b3d86fcb"
 SRC_URI[sha256sum] = "1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68"
@@ -26,13 +29,9 @@ tex_texinfo = "texmf/tex/texinfo"

 inherit gettext autotools

-do_configure() {
-	oe_runconf
-}
-
-do_compile_prepend(){
+do_compile_prepend() {
 	if [ -d tools ];then
-		make -C tools/gnulib/lib
+		oe_runmake -C tools/gnulib/lib
 	fi
 }

--- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch
+++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch
@@ -0,0 +1,19 @@
+Upstream-Status: Pending
+
+Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10
+Fix following build error:
+| Makefile:734: *** missing separator (did you mean TAB instead of 8 spaces?).  Stop.
+| ERROR: oe_runmake failed
+
+Index: matchbox-window-manager-2/Makefile.am
+===================================================================
+--- matchbox-window-manager-2.orig/Makefile.am
+++ matchbox-window-manager-2/Makefile.am
+@@ -3,6 +3,6 @@ SUBDIRS = matchbox data doc util
+ # Extra clean files so that maintainer-clean removes *everything*
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snapshot-`date +"%Y%m%d"`
+	$(MAKE) dist distdir=$(PACKAGE)-snapshot-`date +"%Y%m%d"`
+ 
+ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
--- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_svn.bb
+++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_svn.bb
@@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://matchbox/core/mb-wm.h;endline=21;md5=1b1d328a52790635
 DEPENDS = "virtual/libx11 libxext libxrender startup-notification expat gconf pango libxdamage libxcomposite gtk+"

 PV = "0.0+svnr${SRCPV}"
-PR = "r4"
+PR = "r5"

 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager-2;proto=http \
+	file://fix_makefile.patch \
 	  "

 S = "${WORKDIR}/matchbox-window-manager-2"
--- a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb
@@ -32,7 +32,7 @@ python __anonymous () {
    bb.data.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype, d)
 }

-SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta"
+SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.34;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta"

 # Functionality flags
 KERNEL_REVISION_CHECKING ?= "t"
--- a/meta/recipes-multimedia/libpng/libpng/02-CVE-2011-2501.patch
+++ b/meta/recipes-multimedia/libpng/libpng/02-CVE-2011-2501.patch
@@ -0,0 +1,29 @@
+This patch is taken from upstream and is a fix for CVE CVE-2011-2501
+
+Description: fix denial of service via error message data
+Origin: upstream, http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng/libpng;a=commitdiff;h=65e6d5a34f49acdb362a0625a706c6b914e670af
+
+Upstream-Status: Backport
+
+Signed-off-by: Joshua Lock <josh@linux.intel.com>
+
+Index: libpng-1.2.44/pngerror.c
+===================================================================
+--- libpng-1.2.44.orig/pngerror.c	2011-07-26 08:18:20.769498103 -0400
+++ libpng-1.2.44/pngerror.c	2011-07-26 08:18:32.819498098 -0400
+@@ -181,8 +181,13 @@
+    {
+       buffer[iout++] = ':';
+       buffer[iout++] = ' ';
+-      png_memcpy(buffer + iout, error_message, PNG_MAX_ERROR_TEXT);
+-      buffer[iout + PNG_MAX_ERROR_TEXT - 1] = '\0';
+
+      iin = 0;
+      while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0')
+         buffer[iout++] = error_message[iin++];
+
+      /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */
+      buffer[iout] = '\0';
+    }
+ }
+ 
--- a/meta/recipes-multimedia/libpng/libpng/03-CVE-2011-2690.patch
+++ b/meta/recipes-multimedia/libpng/libpng/03-CVE-2011-2690.patch
@@ -0,0 +1,38 @@
+This patch is taken from upstream and is a fix for CVE CVE-2011-2690
+
+Description: fix denial of service and possible arbitrary code
+ execution via crafted PNG image
+Origin: upstream, http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng/libpng;a=commit;h=d572394c2a018ef22e9685ac189f5f05c08ea6f5
+
+Upstream-Status: Backport
+
+Signed-off-by: Joshua Lock <josh@linux.intel.com>
+
+Index: libpng-1.2.44/pngrtran.c
+===================================================================
+--- libpng-1.2.44.orig/pngrtran.c	2011-07-26 08:18:55.489498092 -0400
+++ libpng-1.2.44/pngrtran.c	2011-07-26 08:19:02.079498092 -0400
+@@ -676,10 +676,21 @@
+ png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red,
+    double green)
+ {
+-   int red_fixed = (int)((float)red*100000.0 + 0.5);
+-   int green_fixed = (int)((float)green*100000.0 + 0.5);
+   int red_fixed, green_fixed;
+    if (png_ptr == NULL)
+       return;
+   if (red > 21474.83647 || red < -21474.83648 ||
+       green > 21474.83647 || green < -21474.83648)
+   {
+      png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients");
+      red_fixed = -1;
+      green_fixed = -1;
+   }
+   else
+   {
+      red_fixed = (int)((float)red*100000.0 + 0.5);
+      green_fixed = (int)((float)green*100000.0 + 0.5);
+   }
+    png_set_rgb_to_gray_fixed(png_ptr, error_action, red_fixed, green_fixed);
+ }
+ #endif
--- a/meta/recipes-multimedia/libpng/libpng/04-CVE-2011-2692.patch
+++ b/meta/recipes-multimedia/libpng/libpng/04-CVE-2011-2692.patch
@@ -0,0 +1,29 @@
+This patch is taken from upstream and is a fix for CVE CVE-2011-2962
+
+Description: fix denial of service and possible arbitrary code
+ execution via invalid sCAL chunks
+Origin: upstream, http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng/libpng;a=commit;h=61a2d8a2a7b03023e63eae9a3e64607aaaa6d339
+
+Upstream-Status: Backport
+
+Signed-off-by: Joshua Lock <josh@linux.intel.com>
+
+Index: libpng-1.2.44/pngrutil.c
+===================================================================
+--- libpng-1.2.44.orig/pngrutil.c	2011-07-26 08:19:22.619498085 -0400
+++ libpng-1.2.44/pngrutil.c	2011-07-26 08:19:26.909498086 -0400
+@@ -1812,6 +1812,14 @@
+       return;
+    }
+ 
+   /* Need unit type, width, \0, height: minimum 4 bytes */
+   else if (length < 4)
+   {
+      png_warning(png_ptr, "sCAL chunk too short");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+    png_debug1(2, "Allocating and reading sCAL chunk data (%lu bytes)",
+       length + 1);
+    png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
--- a/meta/recipes-multimedia/libpng/libpng_1.2.44.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.2.44.bb
@@ -6,9 +6,12 @@ LICENSE = "libpng"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a294a2bb08b7f25558119edbfd6b2e92 \
                    file://png.h;startline=172;endline=261;md5=3253923f0093658f470e52a06ddcf4e7"
 DEPENDS = "zlib"
-PR = "r0"
+PR = "r1"

-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2 \
+           file://02-CVE-2011-2501.patch \
+           file://03-CVE-2011-2690.patch \
+           file://04-CVE-2011-2692.patch"

 SRC_URI[md5sum] = "e3ac7879d62ad166a6f0c7441390d12b"
 SRC_URI[sha256sum] = "b9ab20f1c2c3bf6c4448fd9bd8a4a8905b918114d5fada56c97bb758a17b7215"
--- a/meta/recipes-sato/web/web/makefile-whitespace.patch
+++ b/meta/recipes-sato/web/web/makefile-whitespace.patch
@@ -0,0 +1,11 @@
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
+++ git/Makefile.am
+@@ -5,5 +5,5 @@ SUBDIRS = src data
+ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+ 
--- a/meta/recipes-sato/web/web_git.bb
+++ b/meta/recipes-sato/web/web_git.bb
@@ -4,15 +4,16 @@ DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js libowl"
 DESCRIPTION = "Web is a multi-platform web browsing application."
 PR = "r4"

-PV = "0.0+svnr${SRCPV}"
+PV = "0.0+git${SRCPV}"

-SRC_URI = 	"svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
+SRC_URI = 	"git://git.yoctoproject.org/web-sato;protocol=git \
 		file://owl-window-menu.patch \
+		file://makefile-whitespace.patch \
 		"

 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"

-S = "${WORKDIR}/trunk"
+S = "${WORKDIR}/git"

 do_unpack_append () {
 	bb.build.exec_func('do_remove_patches', d)
--- a/scripts/help2man
+++ b/scripts/help2man
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 1
--- a/scripts/poky-qemu
+++ b/scripts/poky-qemu
@@ -387,6 +387,7 @@ libgl='no'

 test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes'
 test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes'
+test -e /usr/lib/*-linux=gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so && libgl='yes'

 if [ "$libgl" != 'yes' ]; then
    echo "You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.