[PATCH 00/26] Documentation and bug fixes

[PATCH 00/26] Documentation and bug fixes

[Saul Wold]

From: Saul Wold <sgw@linux.intel.com>

This is a batch of documentation updates and metadata bug fixes
addressing know bugs in the yoctoproject bugzilla.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: distro/oe-core
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=distro/oe-core

Thanks,
    Saul Wold <sgw@linux.intel.com>
---


Bruce Ashfield (2):
  u-boot: remove do_install from u-boot.inc
  kernel: remove explicit bash call in do_menuconfig

Dongxiao Xu (2):
  attr: Change SRC_URI to a correct location
  ncurses: Change ncurses patch SRC_URI location

Liping Ke (1):
  ADT: Fix several bugs for adt installer

Mark Hatle (1):
  insane.bbclass: Fix ELF bitsize comparison

Nitin A Kamble (1):
  gcc: take out libiberty files from gcc packages

Paul Eggleton (2):
  util-linux: split out uuidgen to a separate package
  zypper: add util-linux-uuidgen to RRECOMMENDS

Scott Garman (1):
  screenshot: change the order of LDADD arguments

Scott Rifenbark (15):
  documentation/poky-ref-manual/ref-images.xml:  Update to Images
    Appendix
  documentation/poky-ref-manual/introduction.xml: [BUGID# 553] - Fixed
    pokylinux.org link in Nightly Build section
  documentation/poky-ref-manual/introduction.xml: [BUGID# 553] - Fixed
    pokylinux URL
  [BUGID# 553] - documentation/poky-ref-manual/introduction.xml: Fixed
    pokylinux.org URL
  [BUGID# 553] - documentation/poky-ref-manual/introduction.xml: fixed
    pokylinux.org URL
  [BUGID# 553] - documentation/poky-ref-manual/development.xml: Fixed
    pokylinux URLs
  [BUGID# 553] - documentation/poky-ref-manual/development.xml: Fixed
    pokylinux.org URL
  [BUGID# 553] - documentation/poky-ref-manual/faq.xml: Fixed
    pokylinux.org reference
  [BUGID# 553] - documentation/poky-ref-manual/resources.xml: Fixed
    pokylinux URL
  documentation/poky-ref-manual/resources.xml: Text addtions in Links
    section in Appendix I
  [BUGID# 553] - documentation/poky-ref-manual/resources.xml:  Fixed
    pokylinux URL
  [BUGID# 553] - documentation/bsp-guide/bsp.xml: Re-write of
    click-through
  [BUGID# 695] - documentation/bsp-guide/figures/bsp-title.png: Updated
    title graphic
  documentation/bsp-guide/bsp-guide.xml: Updated RP email address
  documentation/bsp-guide/bsp-guide.xml: Updated revision history on
    title page.

Yu Ke (1):
  shadow: upgrade to 4.1.4.3 to fix security vulnerability

 documentation/bsp-guide/bsp-guide.xml              |    9 ++-
 documentation/bsp-guide/bsp.xml                    |   59 ++++++++------
 documentation/bsp-guide/figures/bsp-title.png      |  Bin 15226 -> 15029 bytes
 documentation/poky-ref-manual/development.xml      |   12 ++--
 documentation/poky-ref-manual/faq.xml              |    3 +-
 documentation/poky-ref-manual/introduction.xml     |    8 +-
 documentation/poky-ref-manual/ref-images.xml       |   59 ++++++++------
 documentation/poky-ref-manual/resources.xml        |   13 ++--
 meta/classes/insane.bbclass                        |   84 ++++++++++----------
 meta/classes/kernel.bbclass                        |    2 +-
 meta/lib/oe/qa.py                                  |   21 ++++-
 meta/recipes-bsp/uboot/u-boot.inc                  |    5 -
 meta/recipes-bsp/uboot/u-boot_git.bb               |    2 +-
 meta/recipes-core/ncurses/ncurses_5.7.bb           |    7 +-
 meta/recipes-core/util-linux/util-linux.inc        |    3 +-
 meta/recipes-core/util-linux/util-linux_2.17.2.bb  |    2 +-
 .../gcc/gcc-cross-initial_4.5.1.bb                 |    2 +-
 .../gcc/gcc-cross-intermediate.inc                 |    3 +-
 .../gcc/gcc-cross-intermediate_4.5.1.bb            |    2 +-
 meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb       |    2 +-
 .../gcc/gcc-crosssdk-initial_4.5.1.bb              |    2 +-
 .../gcc/gcc-crosssdk-intermediate_4.5.1.bb         |    2 +-
 meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb    |    2 +-
 meta/recipes-devtools/gcc/gcc-package-cross.inc    |    4 +
 meta/recipes-devtools/gcc/gcc-package-target.inc   |    4 +
 meta/recipes-devtools/gcc/gcc_4.5.1.bb             |    2 +-
 .../installer/adt-installer/adt_installer          |    9 +-
 .../installer/adt-installer/adt_installer.conf     |    8 +-
 .../installer/adt-installer/scripts/data_define    |    2 +-
 .../{shadow-4.1.4.2 => files}/login_defs_pam.sed   |    0
 .../shadow/{shadow-4.1.4.2 => files}/pam.d/chfn    |    0
 .../{shadow-4.1.4.2 => files}/pam.d/chpasswd       |    0
 .../shadow/{shadow-4.1.4.2 => files}/pam.d/chsh    |    0
 .../shadow/{shadow-4.1.4.2 => files}/pam.d/login   |    0
 .../{shadow-4.1.4.2 => files}/pam.d/newusers       |    0
 .../shadow/{shadow-4.1.4.2 => files}/pam.d/passwd  |    0
 .../shadow/{shadow-4.1.4.2 => files}/pam.d/su      |    0
 .../shadow/{shadow-4.1.4.2 => files}/securetty     |    0
 .../shadow-4.1.3-dots-in-usernames.patch           |    0
 .../shadow-4.1.4.2-env-reset-keep-locale.patch     |    0
 .../shadow-4.1.4.2-groupmod-pam-check.patch        |    0
 .../shadow-4.1.4.2-su_no_sanitize_env.patch        |    0
 .../shadow.automake-1.11.patch                     |    0
 .../{shadow_4.1.4.2.bb => shadow_4.1.4.3.bb}       |    4 +-
 meta/recipes-extended/zypper/zypper_git.bb         |    4 +-
 .../files/dso_linking_change_build_fix.patch       |   49 -----------
 .../screenshot/files/fix_ldadd_order.patch         |   12 +++
 meta/recipes-sato/screenshot/screenshot_svn.bb     |    6 +-
 meta/recipes-support/attr/attr.inc                 |    2 +-
 meta/recipes-support/attr/attr_2.4.44.bb           |    2 +-
 50 files changed, 212 insertions(+), 200 deletions(-)
 mode change 100755 => 100644 documentation/bsp-guide/figures/bsp-title.png
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/login_defs_pam.sed (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/chfn (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/chpasswd (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/chsh (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/login (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/newusers (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/passwd (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/su (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/securetty (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/shadow-4.1.3-dots-in-usernames.patch (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/shadow-4.1.4.2-env-reset-keep-locale.patch (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/shadow-4.1.4.2-groupmod-pam-check.patch (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/shadow-4.1.4.2-su_no_sanitize_env.patch (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/shadow.automake-1.11.patch (100%)
 rename meta/recipes-extended/shadow/{shadow_4.1.4.2.bb => shadow_4.1.4.3.bb} (70%)
 delete mode 100644 meta/recipes-sato/screenshot/files/dso_linking_change_build_fix.patch
 create mode 100644 meta/recipes-sato/screenshot/files/fix_ldadd_order.patch

[PATCH 01/26] attr: Change SRC_URI to a correct location

[Saul Wold]

From: Dongxiao Xu <dongxiao.xu@intel.com>

attr has changed its download link, thus change accordingly.

This fixes [BUGID #710]

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/recipes-support/attr/attr.inc       |    2 +-
 meta/recipes-support/attr/attr_2.4.44.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc
index 9a8b0f6..e9467d7 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \
                     file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \
                     file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb"
 
-SRC_URI = "http://download.savannah.gnu.org/attr/${BP}.src.tar.gz"
+SRC_URI = "http://download.savannah.gnu.org/releases/attr/${BP}.src.tar.gz"
 
 require ea-acl.inc
 
diff --git a/meta/recipes-support/attr/attr_2.4.44.bb b/meta/recipes-support/attr/attr_2.4.44.bb
index 4be27d0..a0945f1 100644
--- a/meta/recipes-support/attr/attr_2.4.44.bb
+++ b/meta/recipes-support/attr/attr_2.4.44.bb
@@ -1,6 +1,6 @@
 require attr.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://memory-leak-in-copy.patch \
             file://memory-leak2.patch \
-- 
1.7.1

[PATCH 02/26] ncurses: Change ncurses patch SRC_URI location

[Saul Wold]

From: Dongxiao Xu <dongxiao.xu@intel.com>

One of ncurses's patch has been removed from its original repo
location, use autobuilder cache location instead.

Comment out the original patch address instead of removing it
since we may still need that address when upgrade the recipe later.

This fixes [BUGID #709].

[sgw: fixed having comment embedded in SRC_URI]
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/ncurses/ncurses_5.7.bb |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/ncurses/ncurses_5.7.bb b/meta/recipes-core/ncurses/ncurses_5.7.bb
index f767495..7ab078d 100644
--- a/meta/recipes-core/ncurses/ncurses_5.7.bb
+++ b/meta/recipes-core/ncurses/ncurses_5.7.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
 SECTION = "libs"
 PATCHDATE = "20100501"
 PKGV = "${PV}+${PATCHDATE}"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "ncurses-native"
 DEPENDS_virtclass-native = ""
@@ -15,11 +15,14 @@ inherit autotools binconfig
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz;name=tarball \
         ftp://invisible-island.net/ncurses/5.7/ncurses-5.7-20100424-patch.sh.bz2;apply=yes;name=p20100424sh \
 \
-        ftp://invisible-island.net/ncurses/5.7/ncurses-5.7-${PATCHDATE}.patch.gz;name=p20100501 \
+        http://autobuilder.yoctoproject.org/sources/ncurses-5.7-${PATCHDATE}.patch.gz;name=p20100501 \
         file://tic-hang.patch \
         file://config.cache \
 "
 
+
+#        ftp://invisible-island.net/ncurses/5.7/ncurses-5.7-${PATCHDATE}.patch.gz;name=p20100501 
+
 SRC_URI[tarball.md5sum] = "cce05daf61a64501ef6cd8da1f727ec6"
 SRC_URI[tarball.sha256sum] = "0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4"
 SRC_URI[p20100424sh.md5sum] = "3a5f76613f0f7ec3e0e73b835bc24864"
-- 
1.7.1

[PATCH 03/26] shadow: upgrade to 4.1.4.3 to fix security vulnerability

[Saul Wold]

From: Yu Ke <ke.yu@intel.com>

For CVE-2011-0721: http://lists.debian.org/debian-security-announce/2011/msg00030.html

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 .../{shadow-4.1.4.2 => files}/login_defs_pam.sed   |    0
 .../shadow/{shadow-4.1.4.2 => files}/pam.d/chfn    |    0
 .../{shadow-4.1.4.2 => files}/pam.d/chpasswd       |    0
 .../shadow/{shadow-4.1.4.2 => files}/pam.d/chsh    |    0
 .../shadow/{shadow-4.1.4.2 => files}/pam.d/login   |    0
 .../{shadow-4.1.4.2 => files}/pam.d/newusers       |    0
 .../shadow/{shadow-4.1.4.2 => files}/pam.d/passwd  |    0
 .../shadow/{shadow-4.1.4.2 => files}/pam.d/su      |    0
 .../shadow/{shadow-4.1.4.2 => files}/securetty     |    0
 .../shadow-4.1.3-dots-in-usernames.patch           |    0
 .../shadow-4.1.4.2-env-reset-keep-locale.patch     |    0
 .../shadow-4.1.4.2-groupmod-pam-check.patch        |    0
 .../shadow-4.1.4.2-su_no_sanitize_env.patch        |    0
 .../shadow.automake-1.11.patch                     |    0
 .../{shadow_4.1.4.2.bb => shadow_4.1.4.3.bb}       |    4 ++--
 15 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/login_defs_pam.sed (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/chfn (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/chpasswd (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/chsh (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/login (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/newusers (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/passwd (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/pam.d/su (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/securetty (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/shadow-4.1.3-dots-in-usernames.patch (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/shadow-4.1.4.2-env-reset-keep-locale.patch (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/shadow-4.1.4.2-groupmod-pam-check.patch (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/shadow-4.1.4.2-su_no_sanitize_env.patch (100%)
 rename meta/recipes-extended/shadow/{shadow-4.1.4.2 => files}/shadow.automake-1.11.patch (100%)
 rename meta/recipes-extended/shadow/{shadow_4.1.4.2.bb => shadow_4.1.4.3.bb} (70%)

diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/login_defs_pam.sed b/meta/recipes-extended/shadow/files/login_defs_pam.sed
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/login_defs_pam.sed
rename to meta/recipes-extended/shadow/files/login_defs_pam.sed
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chfn b/meta/recipes-extended/shadow/files/pam.d/chfn
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chfn
rename to meta/recipes-extended/shadow/files/pam.d/chfn
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chpasswd b/meta/recipes-extended/shadow/files/pam.d/chpasswd
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chpasswd
rename to meta/recipes-extended/shadow/files/pam.d/chpasswd
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chsh b/meta/recipes-extended/shadow/files/pam.d/chsh
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/chsh
rename to meta/recipes-extended/shadow/files/pam.d/chsh
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/login b/meta/recipes-extended/shadow/files/pam.d/login
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/login
rename to meta/recipes-extended/shadow/files/pam.d/login
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/newusers b/meta/recipes-extended/shadow/files/pam.d/newusers
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/newusers
rename to meta/recipes-extended/shadow/files/pam.d/newusers
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/passwd b/meta/recipes-extended/shadow/files/pam.d/passwd
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/passwd
rename to meta/recipes-extended/shadow/files/pam.d/passwd
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/su b/meta/recipes-extended/shadow/files/pam.d/su
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/pam.d/su
rename to meta/recipes-extended/shadow/files/pam.d/su
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/securetty b/meta/recipes-extended/shadow/files/securetty
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/securetty
rename to meta/recipes-extended/shadow/files/securetty
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.3-dots-in-usernames.patch b/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.3-dots-in-usernames.patch
rename to meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-env-reset-keep-locale.patch b/meta/recipes-extended/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-env-reset-keep-locale.patch
rename to meta/recipes-extended/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-groupmod-pam-check.patch b/meta/recipes-extended/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-groupmod-pam-check.patch
rename to meta/recipes-extended/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-su_no_sanitize_env.patch b/meta/recipes-extended/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/shadow-4.1.4.2-su_no_sanitize_env.patch
rename to meta/recipes-extended/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch
diff --git a/meta/recipes-extended/shadow/shadow-4.1.4.2/shadow.automake-1.11.patch b/meta/recipes-extended/shadow/files/shadow.automake-1.11.patch
similarity index 100%
rename from meta/recipes-extended/shadow/shadow-4.1.4.2/shadow.automake-1.11.patch
rename to meta/recipes-extended/shadow/files/shadow.automake-1.11.patch
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.2.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
similarity index 70%
rename from meta/recipes-extended/shadow/shadow_4.1.4.2.bb
rename to meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index 224ae5e..c8aa223 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.2.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -8,7 +8,7 @@ SRC_URI += "file://shadow.automake-1.11.patch \
 	    file://shadow-4.1.4.2-groupmod-pam-check.patch \
 	    file://shadow-4.1.4.2-su_no_sanitize_env.patch"
 
-SRC_URI[md5sum] = "d593a9cab93c48ee0a6ba056db8c1997"
-SRC_URI[sha256sum] = "97987f6a7967a85e6aa0dba2a1d52db8bd69af5a717391de5693db768fb78990"
+SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79"
+SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778"
 
 EXTRA_OECONF_libc-uclibc += " --with-nscd=no "
-- 
1.7.1

[PATCH 04/26] ADT: Fix several bugs for adt installer

[Saul Wold]

From: Liping Ke <liping.ke@intel.com>

Two bugs are found
1) image download file path is not correct. So even if file is downloaded
   already, it can't be detected.
2) several images now are renamed, such as sato-dev, sato-sdk, we need to change the name
   accordingly.

Signed-off-by: Liping Ke <liping.ke@intel.com>
---
 .../installer/adt-installer/adt_installer          |    9 +++++----
 .../installer/adt-installer/adt_installer.conf     |    8 ++++----
 .../installer/adt-installer/scripts/data_define    |    2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index 1f481de..cca576f 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -216,17 +216,18 @@ done
 
 download_file()
 {
-if [ -f "$LOCAL_DOWNLOAD/$1" ]; then
-  confirm_download $1
+local filename=`echo ${1##*/}`
+if [ -f "$LOCAL_DOWNLOAD/$filename" ]; then
+  confirm_download $filename
   result="$?"
   if [ ! "$result" == "0" ]; then
     return
   else
     echo "Removing old file [$1]"
-    rm -rf "$LOCAL_DOWNLOAD/$1" 
+    rm -rf "$LOCAL_DOWNLOAD/$filename" 
   fi
 fi
-echo_info "Downloading file: $1..."
+echo_info "Downloading file: $filename..."
 wget "$YOCTOADT_IPKG_REPO/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE" 
 }
 
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index db602f6..d2af70d 100644
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
@@ -39,14 +39,14 @@ YOCTOADT_NFS_UTIL="Y"
 #YOCTOADT_METADATA="Y"
 
 #The followings are for setting up specific target architecture
-#YOCTOADT_ROOTFS_$arch is for specifying what root filesystem image files you want to download from the repository. The valid values to replace $arch are: arm, x86, x86_64, powerpc, mips.  The valid image files are: minimal, sato, sdk and lsb.  If you want to download multiple images, the entries are space separated
-YOCTOADT_ROOTFS_arm="minimal sato"
+#YOCTOADT_ROOTFS_$arch is for specifying what root filesystem image files you want to download from the repository. The valid values to replace $arch are: arm, x86, x86_64, powerpc, mips.  The valid image files are: minimal, minimal-dev, sato, sato-dev, sato-sdk,lsb, lsb-dev, lsb-sdk.  If you want to download multiple images, the entries are space separated
+YOCTOADT_ROOTFS_arm="minimal sato-sdk"
 #Specify which root filesystem file to use to extract as target sysroot.  Please ensure the entry is in the list of downloaded root filesystem files that specified above in YOCTOADT_ROOTFS_$arch
 YOCTOADT_TARGET_SYSROOT_IMAGE_arm="minimal"
 #The location where the target sysroot will be setup
 YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm"
 
 #Here's another example for setting up target arch of x86, by uncommenting it will trigger the installer to download and setup 2 sysroot environment for 2 target arches: arm and x86.  If you want to add more target arch support, you can append more entries by following these samples
-#YOCTOADT_ROOTFS_x86="sdk"
-#YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sdk"
+#YOCTOADT_ROOTFS_x86="sato-sdk"
+#YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sato-sdk"
 #YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86"
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
index 2895c4f..77f8b38 100644
--- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
@@ -31,7 +31,7 @@ OPKG_LIBDIR="/var/lib"
 
 # List all supported root fs types and target types,
 # it will be used in user configuration validity checking
-YOCTOADT_SUPPORTED_ROOTFS="minimal sato sdk lsb"
+YOCTOADT_SUPPORTED_ROOTFS="minimal minimal-dev sato sato-dev sato-sdk lsb lsb-dev lsb-sdk"
 YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc mips"
 # Different host (32 bit or 64 bit) will have different opkg
 # configuration files
-- 
1.7.1

[PATCH 05/26] u-boot: remove do_install from u-boot.inc

[Saul Wold]

From: Bruce Ashfield <bruce.ashfield@windriver.com>

Fixes [BUGID #777]

The do_install rule in u-boot.inc was installing a host
tool into the target ${bindir}, which is subsequently
stripped with target strip during packaging, and the
obvious error ensues.

The native u-boot recipe has its own install rule, and
the machine specific u-boot doesn't require mkimage or
anything else in the do_install function. So we remove
it completely until it is needed again.

[sgw: PR bump]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-bsp/uboot/u-boot.inc    |    5 -----
 meta/recipes-bsp/uboot/u-boot_git.bb |    2 +-
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-bsp/uboot/u-boot.inc b/meta/recipes-bsp/uboot/u-boot.inc
index 1457c04..d1cebee 100644
--- a/meta/recipes-bsp/uboot/u-boot.inc
+++ b/meta/recipes-bsp/uboot/u-boot.inc
@@ -31,8 +31,3 @@ do_deploy () {
 	ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
 }
 addtask deploy before do_build after do_compile
-
-do_install() {
-	install -d ${D}${bindir}
-	install -m 755 tools/mkimage ${D}${bindir}/
-}
diff --git a/meta/recipes-bsp/uboot/u-boot_git.bb b/meta/recipes-bsp/uboot/u-boot_git.bb
index b3207c6..4686a58 100644
--- a/meta/recipes-bsp/uboot/u-boot_git.bb
+++ b/meta/recipes-bsp/uboot/u-boot_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE}"
 
 PV = "v2010.12+${PR}+git${SRCPV}"
-PR="r0"
+PR="r1"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
 
-- 
1.7.1

[PATCH 06/26] documentation/poky-ref-manual/ref-images.xml: Update to Images Appendix

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

Added command 'ls meta*/recipes*/images/*.bb' as the command to see the
supported images.  Also added poky-image-lsb as an image and noted
that poky-image-sdk has becom poky-image-sato-dev.

These fixes are in response to alpha testing for release 1.0 Yocto.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/poky-ref-manual/ref-images.xml |   59 +++++++++++++++-----------
 1 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/documentation/poky-ref-manual/ref-images.xml b/documentation/poky-ref-manual/ref-images.xml
index b74b523..9477883 100644
--- a/documentation/poky-ref-manual/ref-images.xml
+++ b/documentation/poky-ref-manual/ref-images.xml
@@ -5,62 +5,71 @@
     <title>Reference: Images</title>
 
     <para>
-        Poky has several standard images covering most people's standard needs. A full 
-        list of image targets can be found by looking in the directories 
-        <filename class="directory">  meta/recipes-core/images/</filename>, 
-        <filename class="directory">  meta/recipes-extended/images/</filename>, 
-        <filename class="directory">  meta/recipes-sato/images/</filename> and 
-        <filename class="directory">  meta/recipes-tbd/meta/</filename>. The standard 
-        images are listed below along with details of what they contain:
+        Poky has several standard images covering most people's standard needs. 
+        Use the following command to list the supported images:
+        <literallayout class='monospaced'>
+     $ ls meta*/recipes*/images/*.bb
+        </literallayout>
+        Images are listed below along with details of what they contain:
     </para>
 
     <itemizedlist>
             <listitem>
                 <para>
-                    <emphasis>poky-image-minimal</emphasis> - A small image, just enough 
-                    to allow a device to boot
+                    <emphasis>poky-image-minimal</emphasis> - A small image just capable 
+                    of allowing a device to boot.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-base</emphasis> - console only image with full
-                    support of target device hardware
+                    <emphasis>poky-image-base</emphasis> - A console-only image that fully 
+                    supports the target device hardware. 
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-core</emphasis> - X11 image with simple apps like
-                    terminal, editor and file manager
+                    <emphasis>poky-image-core</emphasis> - An X11 image with simple 
+                    applications such as terminal, editor, and file manager.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-sato</emphasis> - X11 image with Sato theme and
-                    Pimlico applications. Also contains terminal, editor and file manager.
+                    <emphasis>poky-image-sato</emphasis> - An X11 image with Sato theme and
+                    Pimlico applications. 
+                    The image also contains terminal, editor, and file manager.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-sdk</emphasis> - X11 image like poky-image-sato but
-                    also include native toolchain and libraries needed to build applications 
-                    on the device itself. Also includes testing and profiling tools and debug
-                    symbols.
+                    <emphasis>poky-image-sato-dev</emphasis> - An X11 image similar to 
+                    poky-image-sato but
+                    also includes a native toolchain and libraries needed to build applications 
+                    on the device itself. The image also includes testing and profiling tools 
+                    as well as debug symbols.  This image was formerly poky-image-sdk.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>meta-toolchain</emphasis> - This generates a tarball containing
-                    a standalone toolchain which can be used externally to Poky. It is self
-                    contained and unpacks to the <filename class="directory">/opt/poky</filename>
-                    directory. It also contains a copy of QEMU and the scripts necessary to run 
+                    <emphasis>poky-image-lsb</emphasis> - An image suitable for implementations 
+                    that conform to Linux Standard Base (LSB).
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <emphasis>meta-toolchain</emphasis> - This image generates a tarball 
+                    that contains a stand-alone toolchain that can be used externally to Poky. 
+                    The tarball is self-contained and unpacks to the 
+                    <filename class="directory">/opt/poky</filename> directory. 
+                    The tarball also contains a copy of QEMU and the scripts necessary to run 
                     poky QEMU images.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>meta-toolchain-sdk</emphasis> - This includes everything in 
+                    <emphasis>meta-toolchain-sdk</emphasis> - This image includes everything in 
                     meta-toolchain but also includes development headers and libraries
-                    forming a complete standalone SDK. See the <link linkend='platdev-appdev-external-sdk'> 
+                    to form a complete standalone SDK. 
+                    See the <link linkend='platdev-appdev-external-sdk'> 
                     External Development Using the Poky SDK</link> section for more information.
                 </para>
             </listitem>
-- 
1.7.1

[PATCH 07/26] documentation/poky-ref-manual/introduction.xml: [BUGID# 553] - Fixed pokylinux.org link in Nightly Build section

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

[BUGID# 553] - In the nightly build section (1.5.2) there is a reference to
http://autobuilder.pokylinux.org/.  This URL resolves to an autobuilder
page that has a bunch of pokylinux links.  I determined that the URL
http://autobuilder.yoctoproject.org/ also resolves to the autobuilder
page so I updated the URL to use the YP link.  This is a partial fix
to Bug 553.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/poky-ref-manual/introduction.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/documentation/poky-ref-manual/introduction.xml b/documentation/poky-ref-manual/introduction.xml
index b2e3452..064c0cb 100644
--- a/documentation/poky-ref-manual/introduction.xml
+++ b/documentation/poky-ref-manual/introduction.xml
@@ -129,7 +129,7 @@
         <para>
             We make nightly builds of Poky for testing purposes and to make the
             latest developments available. The output from these builds is available
-            at <ulink url='http://autobuilder.pokylinux.org/'/>.
+            at <ulink url='http://autobuilder.yoctoproject.org/'/>.
             The numbers used in the builds increase for each subsequent build and can be used to 
             reference a specific build.
         </para>
-- 
1.7.1

[PATCH 08/26] documentation/poky-ref-manual/introduction.xml: [BUGID# 553] - Fixed pokylinux URL

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

    [BUGID# 553] - In the Development Checkouts section (1.5.3)
    there is a reference to
    http://git.pokylinux.org/.  This URL resolves to an older looking
    source area.  I determined that the URL
    http://git.yoctoproject.org/ resolves to the newer Yocto source
    web interface so I changed the URL to that.
    This is a partial fix
    to Bug 553.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/poky-ref-manual/introduction.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/documentation/poky-ref-manual/introduction.xml b/documentation/poky-ref-manual/introduction.xml
index 064c0cb..c7cca8f 100644
--- a/documentation/poky-ref-manual/introduction.xml
+++ b/documentation/poky-ref-manual/introduction.xml
@@ -153,7 +153,7 @@
         <para>
             Poky is available from our git repository located at
             git://git.pokylinux.org/poky.git; a web interface to the repository
-            can be accessed at <ulink url='http://git.pokylinux.org/'/>.
+            can be accessed at <ulink url='http://git.yoctoproject.org/'/>.
         </para>
 
         <para>
-- 
1.7.1

[PATCH 09/26] [BUGID# 553] - documentation/poky-ref-manual/introduction.xml: Fixed pokylinux.org URL

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

[BUGID# 553] - In the Releases section (1.5.1) there was an URL to
http://pokylinux.org/releases.  This URL was old and I replaced it
with http://yoctoproject.org/downloads/poky.  This partially fixes
bug 553.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/poky-ref-manual/introduction.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/documentation/poky-ref-manual/introduction.xml b/documentation/poky-ref-manual/introduction.xml
index c7cca8f..97e7311 100644
--- a/documentation/poky-ref-manual/introduction.xml
+++ b/documentation/poky-ref-manual/introduction.xml
@@ -118,7 +118,7 @@
         <title>Releases</title>
 
         <para>Periodically, we make releases of Poky available
-            at <ulink url='http://pokylinux.org/releases/'/>.
+            at <ulink url='http://yoctoproject.org/downloads/poky/'/>.
             These releases are more stable and more rigorously tested than the nightly development images.
         </para>
     </section>
-- 
1.7.1

[PATCH 10/26] [BUGID# 553] - documentation/poky-ref-manual/introduction.xml: fixed pokylinux.org URL

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

[BUGID# 553] - In the Development Checkouts section (1.5.3) there was a
reference to our git repository located at git://git.pokylinux.org/poky.git.
I changed this to git://git.yoctoproject.org/poky.git.  This is a
partial fix to Bug 553.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/poky-ref-manual/introduction.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/documentation/poky-ref-manual/introduction.xml b/documentation/poky-ref-manual/introduction.xml
index 97e7311..59c6eea 100644
--- a/documentation/poky-ref-manual/introduction.xml
+++ b/documentation/poky-ref-manual/introduction.xml
@@ -152,7 +152,7 @@
 
         <para>
             Poky is available from our git repository located at
-            git://git.pokylinux.org/poky.git; a web interface to the repository
+            git://git.yoctoproject.org/poky.git; a web interface to the repository
             can be accessed at <ulink url='http://git.yoctoproject.org/'/>.
         </para>
 
-- 
1.7.1

[PATCH 11/26] [BUGID# 553] - documentation/poky-ref-manual/development.xml: Fixed pokylinux URLs

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

[BUGID# 553] - In "The Eclipse Plug-in" section (5.1.2.1) there were two
URLs referencing the place to get the Eclipse plug-in.  One specified
the URL to put into the HTTP:// field in the Eclipse IDE when installing
the software.  This URL was incorrect.  I replaced it with the correct
URL, which was http://www.yoctoproject.org/downloads/eclipse-plugin/.

The second URL that was fixed was referencing the source code for the
plug-in.  It had the old pokylinux.org string.  I changed it to
http://git.yoctoproject.org.

These fixes partially address bug 553.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/poky-ref-manual/development.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/documentation/poky-ref-manual/development.xml b/documentation/poky-ref-manual/development.xml
index 4b138e0..9a59d7e 100644
--- a/documentation/poky-ref-manual/development.xml
+++ b/documentation/poky-ref-manual/development.xml
@@ -67,12 +67,13 @@
                 <literallayout class='monospaced'>
      Help -> Install New Software
                 </literallayout>
-                Specify the target URL as <ulink url='http://www.yoctoproject.org/downloads/eclipse-plug-in/'></ulink>.
+                Specify the target URL as 
+                <ulink url='http://www.yoctoproject.org/downloads/eclipse-plugin/'></ulink>.
             </para>
             <para>
                 If you want to download the source code for the plug-in you can find it in the Poky 
                 git repository, which has a web interface, and is located at
-                <ulink url="http://git.pokylinux.org/cgit.cgi/eclipse-poky"></ulink>.
+                <ulink url="http://git.yoctoproject.org"></ulink> under IDE Plugins.
             </para>
   
                 <section id="installing-and-setting-up-the-eclipse-ide">
-- 
1.7.1

[PATCH 12/26] [BUGID# 553] - documentation/poky-ref-manual/development.xml: Fixed pokylinux.org URL

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

[BUGID# 553] - In "The Anjuta Plug-in" section (5.1.2.2) there was
an URL to the source for the Anjuta Plug-in.  The URL had the
pokylinux.org string in it and pointed to the old area.  I changed
the URL to http://git.yoctoproject.org and directed the user to
look under IDE Plugins.

This is a partial fix to bug 553.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/poky-ref-manual/development.xml |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/documentation/poky-ref-manual/development.xml b/documentation/poky-ref-manual/development.xml
index 9a59d7e..db844a9 100644
--- a/documentation/poky-ref-manual/development.xml
+++ b/documentation/poky-ref-manual/development.xml
@@ -302,10 +302,9 @@
                 Plug-in are all required. 
                 The Poky Anjuta Plug-in is available to download as a tarball at the OpenedHand 
                 labs <ulink url="http://labs.o-hand.com/anjuta-poky-sdk-plugin/"></ulink> page or 
-                directly from the Poky Git repository located at 
-                <ulink url="git://git.pokylinux.org/anjuta-poky"></ulink>.
-                You can also access a web interface to the repository at
-                <ulink url="http://git.pokylinux.org/?p=anjuta-poky.git;a=summary"></ulink>.
+                directly from the Poky Git repository located at git://git.yoctoproject.org/anjuta-poky.
+                You can access the source code from a web interface to the repository at
+                <ulink url="http://git.yoctoproject.org/"></ulink> under IDE Plugins.
              </para>
              <para>
                 See the README file contained in the project for more information on 
-- 
1.7.1

[PATCH 13/26] [BUGID# 553] - documentation/poky-ref-manual/faq.xml: Fixed pokylinux.org reference

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

[BUGID# 553] - In the FAQ appendix item H.12 there was a reference
to http://pokylinux.org/sources/* in the question portion.  The
reference should really be http://autobuilder.yoctoproject.org/sources/*.
I made the change.

This is a partial fix for bug 553.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/poky-ref-manual/faq.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/documentation/poky-ref-manual/faq.xml b/documentation/poky-ref-manual/faq.xml
index 7a891b0..03ae714 100644
--- a/documentation/poky-ref-manual/faq.xml
+++ b/documentation/poky-ref-manual/faq.xml
@@ -248,7 +248,8 @@
     <qandaentry>
         <question>
             <para>
-                I see lots of 404 responses for files on http://pokylinux.org/sources/*. Is something wrong?
+                I see lots of 404 responses for files on 
+                http://autobuilder.yoctoproject.org/sources/*. Is something wrong?
             </para>
         </question>
         <answer>
-- 
1.7.1

[PATCH 14/26] [BUGID# 553] - documentation/poky-ref-manual/resources.xml: Fixed pokylinux URL

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

[BUGID# 553] - In the "Bugtracker" section (appendix I - I.2) there is
a reference to the bugtracker.  The text shows just the string
"bug tracker" but the hidden URL was http://bugzilla.pokylinux.org.
I updated the text to say to report problems by using the Bugzilla
application and then gave the URL http://bugzilla.yoctoproject.org
as the reference.

This is a partial fix for bug 553.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/poky-ref-manual/resources.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/poky-ref-manual/resources.xml b/documentation/poky-ref-manual/resources.xml
index b151b21..e6f7b26 100644
--- a/documentation/poky-ref-manual/resources.xml
+++ b/documentation/poky-ref-manual/resources.xml
@@ -18,8 +18,8 @@
     <title>Bugtracker</title>
 
     <para>
-        Problems with Poky should be reported in the 
-        <ulink url='http://bugzilla.pokylinux.org/'>bug tracker</ulink>.
+        Problems with Poky should be reported using the Bugzilla application at 
+        <ulink url='http://bugzilla.yoctoproject.org/'></ulink>.
     </para>
 </section>
 
-- 
1.7.1

[PATCH 15/26] documentation/poky-ref-manual/resources.xml: Text addtions in Links section in Appendix I

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

I added text after the bulleted items "The Poky website" and "BitBake Uer Manual."
These were blank and it was not consistent with the rest of the list.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/poky-ref-manual/resources.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/documentation/poky-ref-manual/resources.xml b/documentation/poky-ref-manual/resources.xml
index e6f7b26..888610c 100644
--- a/documentation/poky-ref-manual/resources.xml
+++ b/documentation/poky-ref-manual/resources.xml
@@ -75,7 +75,8 @@
             for Yocto Project.
         </para></listitem>
         <listitem><para>
-            <ulink url='http://pokylinux.org'>The Poky website</ulink> 
+            <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
@@ -96,8 +97,8 @@
             - The tool used to process Poky metadata.
         </para></listitem>
         <listitem><para>
-            <ulink url='http://bitbake.berlios.de/manual/'>Bitbake User
-                Manual</ulink>
+            <ulink url='http://bitbake.berlios.de/manual/'>BitBake User
+                Manual</ulink> - A comprehensive guide to the BitBake tool.
         </para></listitem>
         <listitem><para>
             <ulink url='http://pimlico-project.org/'>Pimlico</ulink> - A
-- 
1.7.1

[PATCH 16/26] [BUGID# 553] - documentation/poky-ref-manual/resources.xml: Fixed pokylinux URL

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

[BUGID# 553] - In appendix I in the Contributions section (I.6) there is
mention of a Poky contributions tree and the URL
git://git.pokylinux.org/poky-contrib.git is given.  I changed this
URL to git://git.yoctoproject.org/poky-contrib.git.

This is a partial fix for but 553.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/poky-ref-manual/resources.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/documentation/poky-ref-manual/resources.xml b/documentation/poky-ref-manual/resources.xml
index 888610c..dd4b58d 100644
--- a/documentation/poky-ref-manual/resources.xml
+++ b/documentation/poky-ref-manual/resources.xml
@@ -149,7 +149,7 @@
 </programlisting>
 
     <para>
-        A Poky contributions tree (poky-contrib, git://git.pokylinux.org/poky-contrib.git)
+        A Poky contributions tree (poky-contrib, git://git.yoctoproject.org/poky-contrib.git)
         exists for people to stage contributions in, for regular contributors.
         If people desire such access, please ask on the mailing list. Usually
         access will be given to anyone with a proven track record of good patches.
-- 
1.7.1

[PATCH 17/26] [BUGID# 553] - documentation/bsp-guide/bsp.xml: Re-write of click-through

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

[BUGID# 553] - In the 'BSP Click-Through Licensing Procedure'
section, which is shared between the BSP Guide and the Poky
Reference Manual, there were three links to 'pokylinux.org'
sites.  These links were intended to help a user get a license
for encumbered BSPs.  However, the links never did work.  The
section also had some wording that described a propsed naming
convention for BSP tarballs that were encumbered and non-encumbered.
The naming convention is a good idea but has not been followed
so far.

I removed the links and replaced them with general instructions
on how to get through the licensing situation.  Also removed the
hard-line naming rules and replaces with a more general explanation
of how we are naming BSP (e.g. Crown Bay).

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/bsp-guide/bsp.xml |   59 ++++++++++++++++++++++----------------
 1 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index 076c08c..ea9b001 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -533,19 +533,22 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}"
             </para>
 
             <para>
-	      For cases where you can substitute something and still maintain functionality, the Poky website 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 requirements.  
-              If present, this fully 'de-featured' BSP will be named meta-&lt;bsp_name&gt; (i.e. the
-	      normal default naming convention).  
-              If available, this is the simplest the most preferred option.
+	      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
+              requirements.  
+              If present, this fully 'de-featured' BSP will be named appropiately different 
+              than the normal encumbered BSP.
+              If available, this substitution is the simplest and most preferred option.
               This, of course, assumes the resulting functionality meets requirements.
             </para>
 
             <para>
-	      If however, a non-encumbered version is unavailable or the 'free' version would provide unsuitable
-	      functionality or quality, an encumbered version can be used.  
-              Encumbered versions of a BSP are given names of the form meta-&lt;bsp_name&gt;-nonfree.
+	      If however, a non-encumbered version is unavailable or the 'free' version 
+              would provide unsuitable functionality or quality, you can use 
+              an encumbered version.  
             </para>
 
             <para>  
@@ -559,14 +562,23 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}"
 
 		<para>
 		  Get a license key (or keys) for the encumbered BSP by visiting 
+                  a website and providing the name of the BSB and your email address
+                  through a web form.
+                </para>
+ 
+<!--
                   <ulink url='https://pokylinux.org/bsp-keys.html'>https://pokylinux.org/bsp-keys.html</ulink>
 		  and give the name of the BSP and your e-mail address in the web form.
 		</para>
 
+                COMMENT:  This link is not implemented at this point.  
+
 		<programlisting>
 		  [screenshot of dialog box]
 		</programlisting>
 
+-->
+
 		<para>
 		  After agreeing to any applicable license terms, the
 		  BSP key(s) will be immediately sent to the address
@@ -609,7 +621,8 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}"
 		  encumbered BSP.  
                   These prompts usually take the form of instructions
 		  needed to manually fetch the encumbered package(s)
-		  and md5 sums into the required directory (e.g. the poky/build/downloads)
+		  and md5 sums into the required directory 
+                  (e.g. the <filename>poky/build/downloads</filename>).
                   Once the manual package fetch has been
 		  completed, restart the build to continue where
 		  it left off.
@@ -619,25 +632,21 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}"
               </listitem>
               <listitem>
 		<para>
-		  Get a full-featured BSP recipe rather than a key, by
-		  visiting
-		  <ulink url='https://pokylinux.org/bsps.html'>https://pokylinux.org/bsps.html</ulink>.
-		  Accepting the license agreement(s) presented will
-		  subsequently allow you to download a tarball
-		  containing a full-featured BSP that is legally cleared for
-		  your use by the just-given license agreement(s).
-		  This method will also allow the encumbered image to
-		  be built with no change at all to the normal build
-		  process.
-		</para>
+		  Get a full-featured BSP recipe rather than a key.
+                  You can do this by visiting the applicable BSP download page from the Yocto 
+                  Project website at
+                  <ulink url='http://yoctoproject.org/download/board-support-package-bsp-downloads'></ulink>.
+		  BSP tarballs that have proprietary information can be downloaded after agreeing 
+                  to licensing requirements as part of the download process. 
+                  Obtaining the code this way allows you to build an encumbered image with 
+                  no changes at all as compared to the normal build. 
+                </para>
               </listitem>
 	    </orderedlist>
 	    <para>
 	      Note that the third method is also the only option available
-	      when downloading pre-compiled images generated from
-	      non-free BSPs.  
-              Those images are likewise available at
-	      <ulink url='https://pokylinux.org/bsps.html'>https://pokylinux.org/bsps.html</ulink>.
+	      when downloading pre-compiled images generated from non-free BSPs.  
+              Those images are likewise available at from the Yocto Project website.
             </para> 
         </section>
 
-- 
1.7.1

[PATCH 18/26] [BUGID# 695] - documentation/bsp-guide/figures/bsp-title.png: Updated title graphic

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

[BUGID# 695] - I updated the title to use a less bold and intrusive
font and one that is still common for systems.  Also removed the
"s" in the title so it now reads "Board Support Package (BSP)
Developer's Guide."  I also put a better looking Yocto logo in.

Once this commit is merged bug #695 can be marked resolved.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/bsp-guide/figures/bsp-title.png |  Bin 15226 -> 15029 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 documentation/bsp-guide/figures/bsp-title.png

diff --git a/documentation/bsp-guide/figures/bsp-title.png b/documentation/bsp-guide/figures/bsp-title.png
old mode 100755
new mode 100644
index ea9600ee4d340eccd7a05fa94cdc8768d90a9a85..70d7929aff734e937c69c08bf5e84d2be82c3f1c
GIT binary patch
literal 15029
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
Bmzn?o

literal 15226
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

-- 
1.7.1

[PATCH 19/26] documentation/bsp-guide/bsp-guide.xml: Updated RP email address

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

Changed the email address for Richard Purdie in the author title
page to richard.purdie@linuxfoundation.org.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/bsp-guide/bsp-guide.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml
index a591c64..4361a2c 100644
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -23,7 +23,7 @@
                 <affiliation>
                     <orgname>Intel Corporation</orgname>
                 </affiliation>
-                <email>richard@linux.intel.com</email>
+                <email>richard.purdie@linuxfoundation.org</email>
             </author>
         </authorgroup>
 
-- 
1.7.1

[PATCH 20/26] documentation/bsp-guide/bsp-guide.xml: Updated revision history on title page.

[Saul Wold]

From: Scott Rifenbark <scott.m.rifenbark@intel.com>

I updated the revision history on the title page to reflect the upcoming
Release 1.0.  I will likely have to change this as we get nearer the
release so I can be sure of the number and also add meaning release
remarks to the entry.

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
---
 documentation/bsp-guide/bsp-guide.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/documentation/bsp-guide/bsp-guide.xml b/documentation/bsp-guide/bsp-guide.xml
index 4361a2c..2862e2e 100644
--- a/documentation/bsp-guide/bsp-guide.xml
+++ b/documentation/bsp-guide/bsp-guide.xml
@@ -29,9 +29,14 @@
 
         <revhistory>
             <revision>
+                <revnumber>1.0</revnumber>
+                <date>1 April 2011</date>
+                <revremark>This release represents the initial full release for Yocto Project.</revremark>
+            </revision>
+            <revision>
                 <revnumber>0.9</revnumber>
                 <date>27 October 2010</date>
-                <revremark>Beta Draft</revremark>
+                <revremark>This release represents the Yocto Project Beta Draft.</revremark>
             </revision>
         </revhistory>
 
-- 
1.7.1

[PATCH 21/26] util-linux: split out uuidgen to a separate package

[Saul Wold]

From: Paul Eggleton <paul.eggleton@linux.intel.com>

uuidgen is needed by zypper and we don't want to drag in everything else
in util-linux, so split it out to a separate package.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-core/util-linux/util-linux.inc       |    3 ++-
 meta/recipes-core/util-linux/util-linux_2.17.2.bb |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 3f3ee35..6f8bcb3 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -30,7 +30,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${MAJOR_VERSION}/u
 PACKAGES =+ "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff \
                     util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile \
                     util-linux-libblkid util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
-                    util-linux-lscpu \
+                    util-linux-lscpu util-linux-uuidgen \
                    "
 
 S = "${WORKDIR}/util-linux-ng-${PV}"
@@ -50,6 +50,7 @@ FILES_util-linux-mount = "${base_bindir}/mount.${PN}"
 FILES_util-linux-umount = "${base_bindir}/umount.${PN}"
 FILES_util-linux-readprofile = "${base_sbindir}/readprofile"
 FILES_util-linux-lscpu = "${bindir}/lscpu"
+FILES_util-linux-uuidgen = "${bindir}/uuidgen"
 
 FILES_util-linux-libblkid = "${libdir}/libblkid.so.*"
 FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.a ${libdir}/libblkid.la ${includedir}/blkid"
diff --git a/meta/recipes-core/util-linux/util-linux_2.17.2.bb b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
index e0904db..190a9e3 100644
--- a/meta/recipes-core/util-linux/util-linux_2.17.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
@@ -1,6 +1,6 @@
 MAJOR_VERSION = "2.17"
 require util-linux.inc
-PR = "r5"
+PR = "r6"
 
 SRC_URI += "file://uclibc-compile.patch \
 	          file://util-linux-ng-replace-siginterrupt.patch \
-- 
1.7.1

[PATCH 22/26] zypper: add util-linux-uuidgen to RRECOMMENDS

[Saul Wold]

From: Paul Eggleton <paul.eggleton@linux.intel.com>

zypper complains if uuidgen is not available, so add it to RRECOMMENDS
for the zypper package.

Addresses [BUGID #749]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-extended/zypper/zypper_git.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb
index 729eabd..af6bd49 100644
--- a/meta/recipes-extended/zypper/zypper_git.bb
+++ b/meta/recipes-extended/zypper/zypper_git.bb
@@ -5,8 +5,8 @@ LICENSE  = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413"
 
 DEPENDS  = "libzypp augeas"
-RRECOMMENDS_${PN} = "procps"
-PR = "r3"
+RRECOMMENDS_${PN} = "procps util-linux-uuidgen"
+PR = "r4"
 
 inherit cmake
 
-- 
1.7.1

[PATCH 23/26] gcc: take out libiberty files from gcc packages

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

this Fixes [BUGID #754]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../gcc/gcc-cross-initial_4.5.1.bb                 |    2 +-
 .../gcc/gcc-cross-intermediate.inc                 |    3 ++-
 .../gcc/gcc-cross-intermediate_4.5.1.bb            |    2 +-
 meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb       |    2 +-
 .../gcc/gcc-crosssdk-initial_4.5.1.bb              |    2 +-
 .../gcc/gcc-crosssdk-intermediate_4.5.1.bb         |    2 +-
 meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb    |    2 +-
 meta/recipes-devtools/gcc/gcc-package-cross.inc    |    4 ++++
 meta/recipes-devtools/gcc/gcc-package-target.inc   |    4 ++++
 meta/recipes-devtools/gcc/gcc_4.5.1.bb             |    2 +-
 10 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb
index b2c257d..38e0964 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb
@@ -1,5 +1,5 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-PR = "r2"
+PR = "r3"
 
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index 2e5283d..92c3ce2 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -35,7 +35,8 @@ do_install () {
 	rm -rf ${D}${datadir}/
 
 	# We use libiberty from binutils
-	rm -f ${D}${exec_prefix}/lib/lib/libiberty.a
+	find -name libiberty.a ${D}${exec_prefix}/lib | xargs rm -f
+	find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f
 
 	# Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
 	# found. These need to be relative paths so they work in different locations.
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb
index e65d5df..9a30cb5 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb
@@ -1,4 +1,4 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-PR = "r3"
+PR = "r4"
 
diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb
index 399cdf9..78bb05a 100644
--- a/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb
index 240caf5..fec53b9 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb
@@ -1,4 +1,4 @@
 require gcc-cross-initial_${PV}.bb
 require gcc-crosssdk-initial.inc
 
-PR = "r2"
+PR = "r3"
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb
index a6653dd..161d870 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb
@@ -1,4 +1,4 @@
 require gcc-cross-intermediate_${PV}.bb
 require gcc-crosssdk-intermediate.inc
 
-PR = "r2"
+PR = "r3"
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb
index 129e8d3..7069088 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb
@@ -1,4 +1,4 @@
 require gcc-cross_${PV}.bb
 require gcc-crosssdk.inc
 
-PR = "r2"
+PR = "r3"
diff --git a/meta/recipes-devtools/gcc/gcc-package-cross.inc b/meta/recipes-devtools/gcc/gcc-package-cross.inc
index 4f902fa..04c8101 100644
--- a/meta/recipes-devtools/gcc/gcc-package-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-cross.inc
@@ -27,6 +27,10 @@ do_install () {
 		rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/$d
 	done
 
+	# We use libiberty from binutils
+	find -name libiberty.a ${D}${exec_prefix}/lib | xargs rm -f
+	find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f
+
 	# gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build
 	if [ "${PN}" == "gcc-cross" -o "${PN}" == "gcc-crosssdk" ]; then
 		dest=${D}/${includedir}/gcc-build-internal-${MULTIMACH_TARGET_SYS}
diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
index 3286da6..d61e96b 100644
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -86,6 +86,10 @@ do_install () {
 	# We don't care about the gcc-<version> ones for this
 	rm -f *gcc-?.?*
 
+	# We use libiberty from binutils
+	find -name libiberty.a ${D}${exec_prefix}/lib | xargs rm -f
+	find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f
+
 	# Symlinks so we can use these trivially on the target
 	ln -sf ${TARGET_SYS}-g77 g77 || true
 	ln -sf ${TARGET_SYS}-gfortran gfortran || true
diff --git a/meta/recipes-devtools/gcc/gcc_4.5.1.bb b/meta/recipes-devtools/gcc/gcc_4.5.1.bb
index 919d4b0..25e455c 100644
--- a/meta/recipes-devtools/gcc/gcc_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc_4.5.1.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
-- 
1.7.1

[PATCH 24/26] screenshot: change the order of LDADD arguments

[Saul Wold]

From: Scott Garman <scott.a.garman@intel.com>

Rather than setting linker flags explicitly in LDADD as the
previous patch did, simply put libshot.la before GTK_LIBS.

This fixes [BUGID #664]

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 .../files/dso_linking_change_build_fix.patch       |   49 --------------------
 .../screenshot/files/fix_ldadd_order.patch         |   12 +++++
 meta/recipes-sato/screenshot/screenshot_svn.bb     |    6 +-
 3 files changed, 15 insertions(+), 52 deletions(-)
 delete mode 100644 meta/recipes-sato/screenshot/files/dso_linking_change_build_fix.patch
 create mode 100644 meta/recipes-sato/screenshot/files/fix_ldadd_order.patch

diff --git a/meta/recipes-sato/screenshot/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/screenshot/files/dso_linking_change_build_fix.patch
deleted file mode 100644
index d3a9ed1..0000000
--- a/meta/recipes-sato/screenshot/files/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-after gcc linking has changed, all the libraries must be explicitely specified 
-This patch avoids these linking errors:
-
-
-
-| i586-poky-linux-libtool: link: ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -g -pthread -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/gtk-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/gtk-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/atk-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/cairo -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pango-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/glib-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/glib-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pixman-1 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/freetype2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libpng12 -pthread -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/glib-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/glib-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/gtk-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/gtk-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/atk-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/cairo -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pango-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pixman-1 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/freetype2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libpng12 -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o .libs/screenshot main.o -pthread  /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgtk-x11-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgdk-x11-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libatk-1.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgdk_pixbuf-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgio-2.0.so -lresolv /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpangocairo-1.0.so -L/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpangoft2-1.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libstdc++.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libcairo.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpixman-1.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpng12.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libxcb.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXau.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXdmcp.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libz.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpango-1.0.so -lm /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libfontconfig.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libfreetype.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libexpat.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgobject-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgmodule-2.0.so -ldl /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgthread-2.0.so -lpthread /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libglib-2.0.so -lrt ./.libs/libshot.a -pthread
-| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: L: invalid DSO for symbol `gdk_cursor_unref' definition
-| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgdk-x11-2.0.so: could not read symbols: Bad value
-| collect2: ld returned 1 exit status
-| make[1]: *** [screenshot] Error 1
-
-
-
-
-| i586-poky-linux-libtool: link: ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -g -pthread -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/gtk-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/gtk-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/atk-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/cairo -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pango-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/glib-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/glib-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pixman-1 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/freetype2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libpng12 -pthread -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/glib-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/glib-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/gtk-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/gtk-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/atk-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/cairo -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pango-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pixman-1 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/freetype2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libpng12 -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o .libs/screenshot main.o -pthread  /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgtk-x11-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libatk-1.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgdk_pixbuf-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgio-2.0.so -lresolv /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpangocairo-1.0.so -L/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpangoft2-1.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libstdc++.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libcairo.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpixman-1.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpng12.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libxcb.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXau.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXdmcp.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libz.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpango-1.0.so -lm /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libfontconfig.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libfreetype.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libexpat.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgobject-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgmodule-2.0.so -ldl /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgthread-2.0.so -lpthread /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libglib-2.0.so -lrt ./.libs/libshot.a /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgdk-x11-2.0.so -pthread
-| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: a: invalid DSO for symbol `gdk_pixbuf_unref' definition
-| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgdk_pixbuf-2.0.so: could not read symbols: Bad value
-| collect2: ld returned 1 exit status
-| make[1]: *** [screenshot] Error 1
-
-
-| i586-poky-linux-libtool: link: ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -g -pthread -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/gtk-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/gtk-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/atk-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/cairo -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pango-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/glib-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/glib-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pixman-1 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/freetype2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libpng12 -pthread -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/glib-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/glib-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/gtk-2.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/gtk-2.0/include -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/atk-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/cairo -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pango-1.0 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/pixman-1 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/freetype2 -I/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/include/libpng12 -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o .libs/screenshot main.o -pthread  /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgtk-x11-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libatk-1.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpangocairo-1.0.so -L/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpangoft2-1.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libstdc++.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libcairo.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpixman-1.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpng12.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libxcb.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXau.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXdmcp.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libpango-1.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libfontconfig.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libfreetype.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libexpat.so ./.libs/libshot.a /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgdk-x11-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgdk_pixbuf-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgio-2.0.so -lresolv /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libz.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgobject-2.0.so /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgmodule-2.0.so -ldl /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libgthread-2.0.so -lpthread /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libglib-2.0.so -lrt -lm -pthread
-| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: }: invalid DSO for symbol `XUngrabServer' definition
-| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so: could not read symbols: Bad value
-| collect2: ld returned 1 exit status
-| make[1]: *** [screenshot] Error 1
-
-Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: 2011/01/11
-
-Update:
-This is identified as a libtool issue. While creating the libshot.la 
-file, libtool should have added these needed libraries in there.
- A bug has been created for this issue: 
-   http://bugzilla.pokylinux.org/show_bug.cgi?id=664
-Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: 2011/01/19
-
-
-Index: screenshot/Makefile.am
-===================================================================
---- screenshot.orig/Makefile.am
-+++ screenshot/Makefile.am
-@@ -23,4 +23,4 @@ endif
- # A standalone tool for running from a terminal and scripts
- bin_PROGRAMS = screenshot
- screenshot_SOURCES = main.c
--screenshot_LDADD = $(GTK_LIBS) libshot.la
-+screenshot_LDADD = $(GTK_LIBS) libshot.la -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lX11
diff --git a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch b/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch
new file mode 100644
index 0000000..726d590
--- /dev/null
+++ b/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch
@@ -0,0 +1,12 @@
+Fix the ordering of LDADD options to fix a compilation failure.
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am
+--- screenshot.orig//Makefile.am	2010-06-29 11:55:00.000000000 -0700
++++ screenshot/Makefile.am	2011-03-01 11:09:01.215813968 -0800
+@@ -23,4 +23,4 @@
+ # A standalone tool for running from a terminal and scripts
+ bin_PROGRAMS = screenshot
+ screenshot_SOURCES = main.c
+-screenshot_LDADD = $(GTK_LIBS) libshot.la
++screenshot_LDADD = libshot.la $(GTK_LIBS)
diff --git a/meta/recipes-sato/screenshot/screenshot_svn.bb b/meta/recipes-sato/screenshot/screenshot_svn.bb
index ff2b7c8..f9c4db6 100644
--- a/meta/recipes-sato/screenshot/screenshot_svn.bb
+++ b/meta/recipes-sato/screenshot/screenshot_svn.bb
@@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 PRIORITY = "optional"
 DEPENDS = "matchbox-panel-2"
 PV = "0.0+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http\
-	file://dso_linking_change_build_fix.patch"
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \
+           file://fix_ldadd_order.patch"
 
 S = ${WORKDIR}/${PN}
 
-- 
1.7.1

[PATCH 25/26] kernel: remove explicit bash call in do_menuconfig

[Saul Wold]

From: Bruce Ashfield <bruce.ashfield@windriver.com>

Fixes [BUGID #598]

The explicit addition of "bash" before "make menuconfig"
is clearing variables that are required for pseudo. The
end result is that menuconfig often fails silently with:

ERROR: ld.so: object 'libpseudo.so' from LD_PRELOAD cannot be preloaded: ignored.

Removing bash from the menuconfig SHELLCMDS variable fixes
the psudo problem.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 5d9b86a..a1b1354 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -202,7 +202,7 @@ do_menuconfig() {
         export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}'
         export XAUTHORITY='${XAUTHORITY}'
 	export TERMWINDOWTITLE="${PN} Kernel Configuration"
-	export SHELLCMDS="bash make menuconfig"
+	export SHELLCMDS="make menuconfig"
 	${TERMCMDRUN}
 	if [ $? -ne 0 ]; then
 		echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."
-- 
1.7.1

[PATCH 26/26] insane.bbclass: Fix ELF bitsize comparison

[Saul Wold]

From: Mark Hatle <mark.hatle@windriver.com>

Fix the way the ELF size is compared to ensure that incorrectly
sized ELF binaries are captured during the file scan.

lib/oe/qa.py is changed to accept a bitsize as a parameter.  Instead
of previously defining true/false, it now takes "0" undefined, "32"
32-bit, and "64" 64-bit as the size argument.  This allows us to
preserve existing behavior of only loading one ELF type, while
allowing the function to be able to discover the size on it's own.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/classes/insane.bbclass |   84 ++++++++++++++++++++++---------------------
 meta/lib/oe/qa.py           |   21 +++++++++--
 2 files changed, 60 insertions(+), 45 deletions(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index b376470..8124384 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -32,58 +32,58 @@ PACKAGEFUNCS += " do_package_qa "
 def package_qa_get_machine_dict():
     return {
             "darwin9" : { 
-                        "arm" :       (40,     0,    0,          True,          True),
+                        "arm" :       (40,     0,    0,          True,          32),
                       },
             "linux" : { 
-                        "arm" :       (40,    97,    0,          True,          True),
-                        "armeb":      (40,    97,    0,          False,         True),
-                        "powerpc":    (20,     0,    0,          False,         True),
-                        "i386":       ( 3,     0,    0,          True,          True),
-                        "i486":       ( 3,     0,    0,          True,          True),
-                        "i586":       ( 3,     0,    0,          True,          True),
-                        "i686":       ( 3,     0,    0,          True,          True),
-                        "x86_64":     (62,     0,    0,          True,          False),
-                        "ia64":       (50,     0,    0,          True,          False),
-                        "alpha":      (36902,  0,    0,          True,          False),
-                        "hppa":       (15,     3,    0,          False,         True),
-                        "m68k":       ( 4,     0,    0,          False,         True),
-                        "mips":       ( 8,     0,    0,          False,         True),
-                        "mipsel":     ( 8,     0,    0,          True,          True),
-                        "s390":       (22,     0,    0,          False,         True),
-                        "sh4":        (42,     0,    0,          True,          True),
-                        "sparc":      ( 2,     0,    0,          False,         True),
+                        "arm" :       (40,    97,    0,          True,          32),
+                        "armeb":      (40,    97,    0,          False,         32),
+                        "powerpc":    (20,     0,    0,          False,         32),
+                        "i386":       ( 3,     0,    0,          True,          32),
+                        "i486":       ( 3,     0,    0,          True,          32),
+                        "i586":       ( 3,     0,    0,          True,          32),
+                        "i686":       ( 3,     0,    0,          True,          32),
+                        "x86_64":     (62,     0,    0,          True,          64),
+                        "ia64":       (50,     0,    0,          True,          64),
+                        "alpha":      (36902,  0,    0,          True,          64),
+                        "hppa":       (15,     3,    0,          False,         32),
+                        "m68k":       ( 4,     0,    0,          False,         32),
+                        "mips":       ( 8,     0,    0,          False,         32),
+                        "mipsel":     ( 8,     0,    0,          True,          32),
+                        "s390":       (22,     0,    0,          False,         32),
+                        "sh4":        (42,     0,    0,          True,          32),
+                        "sparc":      ( 2,     0,    0,          False,         32),
                       },
             "linux-uclibc" : { 
-                        "arm" :       (  40,    97,    0,          True,          True),
-                        "armeb":      (  40,    97,    0,          False,         True),
-                        "powerpc":    (  20,     0,    0,          False,         True),
-                        "i386":       (   3,     0,    0,          True,          True),
-                        "i486":       (   3,     0,    0,          True,          True),
-                        "i586":       (   3,     0,    0,          True,          True),
-                        "i686":       (   3,     0,    0,          True,          True),
-                        "x86_64":     (  62,     0,    0,          True,          False),
-                        "mips":       (   8,     0,    0,          False,         True),
-                        "mipsel":     (   8,     0,    0,          True,          True),
-                        "avr32":      (6317,     0,    0,          False,         True),
-			"sh4":        (42,	 0,    0,          True,          True),
+                        "arm" :       (  40,    97,    0,          True,          32),
+                        "armeb":      (  40,    97,    0,          False,         32),
+                        "powerpc":    (  20,     0,    0,          False,         32),
+                        "i386":       (   3,     0,    0,          True,          32),
+                        "i486":       (   3,     0,    0,          True,          32),
+                        "i586":       (   3,     0,    0,          True,          32),
+                        "i686":       (   3,     0,    0,          True,          32),
+                        "x86_64":     (  62,     0,    0,          True,          64),
+                        "mips":       (   8,     0,    0,          False,         32),
+                        "mipsel":     (   8,     0,    0,          True,          32),
+                        "avr32":      (6317,     0,    0,          False,         32),
+			"sh4":        (42,	 0,    0,          True,          32),
 
                       },
             "uclinux-uclibc" : {
-                        "bfin":       ( 106,     0,    0,          True,         True),
+                        "bfin":       ( 106,     0,    0,          True,         32),
                       }, 
             "linux-gnueabi" : {
-                        "arm" :       (40,     0,    0,          True,          True),
-                        "armeb" :     (40,     0,    0,          False,         True),
+                        "arm" :       (40,     0,    0,          True,          32),
+                        "armeb" :     (40,     0,    0,          False,         32),
                       },
             "linux-uclibcgnueabi" : {
-                        "arm" :       (40,     0,    0,          True,          True),
-                        "armeb" :     (40,     0,    0,          False,         True),
+                        "arm" :       (40,     0,    0,          True,          32),
+                        "armeb" :     (40,     0,    0,          False,         32),
                       },
             "linux-gnuspe" : {
-                        "powerpc":    (20,     0,    0,          False,         True),
+                        "powerpc":    (20,     0,    0,          False,         32),
                       },
             "linux-uclibcspe" : {
-                        "powerpc":    (20,     0,    0,          False,         True),
+                        "powerpc":    (20,     0,    0,          False,         32),
                       },
 
        }
@@ -243,7 +243,7 @@ def package_qa_check_arch(path,name,d, elf):
         return True
 
     #if this will throw an exception, then fix the dict above
-    (machine, osabi, abiversion, littleendian, bits32) \
+    (machine, osabi, abiversion, littleendian, bits) \
         = package_qa_get_machine_dict()[target_os][target_arch]
 
     # Check the architecture and endiannes of the binary
@@ -251,6 +251,10 @@ def package_qa_check_arch(path,name,d, elf):
         error_msg = "Architecture did not match (%d to %d) on %s" % \
                  (machine, elf.machine(), package_qa_clean_path(path,d))
         sane = package_qa_handle_error(4, error_msg, name, path, d)
+    elif not bits == elf.abiSize():
+        error_msg = "Bit size did not match (%d to %d) on %s" % \
+                 (bits, elf.abiSize(), package_qa_clean_path(path,d))
+        sane = package_qa_handle_error(4, error_msg, name, path, d)
     elif not littleendian == elf.isLittleEndian():
         error_msg = "Endiannes did not match (%d to %d) on %s" % \
                  (littleendian, elf.isLittleEndian(), package_qa_clean_path(path,d))
@@ -445,14 +449,12 @@ def package_qa_walk(path, funcs, package,d):
     #if this will throw an exception, then fix the dict above
     target_os   = bb.data.getVar('TARGET_OS',   d, True)
     target_arch = bb.data.getVar('TARGET_ARCH', d, True)
-    (machine, osabi, abiversion, littleendian, bits32) \
-        = package_qa_get_machine_dict()[target_os][target_arch]
 
     sane = True
     for root, dirs, files in os.walk(path):
         for file in files:
             path = os.path.join(root,file)
-            elf = oe.qa.ELFFile(path, bits32)
+            elf = oe.qa.ELFFile(path)
             try:
                 elf.open()
             except:
diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index 0181393..7adf4d0 100644
--- a/meta/lib/oe/qa.py
+++ b/meta/lib/oe/qa.py
@@ -25,9 +25,9 @@ class ELFFile:
             #print "'%x','%x' %s" % (ord(expectation), ord(result), self.name)
             raise Exception("This does not work as expected")
 
-    def __init__(self, name, bits32):
+    def __init__(self, name, bits = 0):
         self.name = name
-        self.bits32 = bits32
+        self.bits = bits
 
     def open(self):
         self.file = file(self.name, "r")
@@ -38,10 +38,20 @@ class ELFFile:
         self.my_assert(self.data[1], 'E')
         self.my_assert(self.data[2], 'L')
         self.my_assert(self.data[3], 'F')
-        if self.bits32 :
+        if self.bits == 0:
+            if self.data[ELFFile.EI_CLASS] == chr(ELFFile.ELFCLASS32):
+                self.bits == 32
+            elif self.data[ELFFile.EI_CLASS] == chr(ELFFile.ELFCLASS64):
+                self.bits == 64
+            else:
+                # Not 32-bit or 64.. lets assert
+                raise Exception("ELF but not 32 or 64 bit.")
+        elif self.bits == 32:
             self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32))
-        else:
+        elif self.bits == 64:
             self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64))
+        else:
+            raise Exception("Must specify unknown, 32 or 64 bit size.")
         self.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) )
 
         self.sex = self.data[ELFFile.EI_DATA]
@@ -60,6 +70,9 @@ class ELFFile:
     def abiVersion(self):
         return ord(self.data[ELFFile.EI_ABIVERSION])
 
+    def abiSize(self):
+	return self.bits
+
     def isLittleEndian(self):
         return self.sex == "<"
 
-- 
1.7.1

Re: [PATCH 00/26] Documentation and bug fixes

[Richard Purdie]

On Wed, 2011-03-02 at 10:00 -0800, Saul Wold wrote:
> From: Saul Wold <sgw@linux.intel.com>
> 
> This is a batch of documentation updates and metadata bug fixes
> addressing know bugs in the yoctoproject bugzilla.
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: distro/oe-core
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=distro/oe-core
> 
> Thanks,
>     Saul Wold <sgw@linux.intel.com>

Merged into OE-Core master, thanks Saul.

Cheers,

Richard