[CONSOLIDATED PULL 00/28] Fixes & eglibc 2.16

[CONSOLIDATED PULL 00/28] Fixes & eglibc 2.16

[Saul Wold]

Richard,

This is a batch of changes that have seen various level of
build testing.  It is currently building on the AB, so you 
can monitor and decide.

We have had a new of parallel build related issues in
telepathy and tonght in bash (this may be related to 
Otavio's re-enablement)

I think that the eglibc update is ready, we have to deal with
Paul's changes, but Khem may have a patch that I need to test
tomorrow.

I like the idea of including remake in as a debugging tool, not ready 
to convert to it yet, as I think we need to test that more.

Thanks
	Sau!


The following changes since commit 4148bc80c008d25c8a536c7c7dfdeac1669a6662:

  libgcc: Add missing dependency on libc:do_package (2012-07-24 10:12:08 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/stage
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Andrei Gherzan (1):
  package.bbclass: Create symlinks for packages with different packaged
    name

Bruce Ashfield (1):
  linux-yocto/3.4: 3.4.6 and 3.4.x-rt14

Christopher Larson (2):
  initscripts: don't bg mk_dirs in populate-volatile
  libpcap: fix pcap-config to not return -Wl,-rpath

Denis Carikli (1):
  kernel.bbclass: fix external module building

Khem Raj (6):
  qemu.bbclass: Map the qemu binary name for powerpc64
  cups_1.4.6.bb: Fix build on ppc64
  libcgroup_0.37.1.bb: Add recipe
  eglibc-initial: Fix build failure due to missing limits.h
  gcc-cross-initial: Stage self sufficient fixed limits.h
  eglibc: Fix build when OPTION_POSIX_WIDE_CHAR_DEVICE_IO is not set

Koen Kooi (1):
  kernel bbclass: Recreate uImage only when KEEPUIMAGE != "yes"

Mark Hatle (1):
  Add missing Upstream-Status to various patches.

Otavio Salvador (4):
  bash: enable parallel build
  bash: fix warning about bashbug reference /usr/bin when installed in
    /bin
  shadow-native: use 'users' group by default
  shadow: use 'users' group by default

Paul Eggleton (2):
  dhcp: remove dependency of dev/staticdev packages on main package
  classes/package_deb: add PackageArch field

Robert P. J. Day (3):
  libxp: Change superfluous "+=" to simple "=" when using _append
  webkit-gtk: Replace superfluous "+=" with "=", and add leading space
  xinit_1.3.2: Remove broken, superfluous 'FILES_${PN} +=
    "${libdir}X11/xinit"'

Robert Yang (1):
  package-index: inherit pythonnative

Ross Burton (1):
  core-image: remove x11-netbook package group, it's unused

Roy.Li (1):
  busybox:udhcpc: fix the root_is_nfs() function

Saul Wold (1):
  tcmode-default: Bump EGLIBC Version to 2.16

Wenzong Fan (1):
  remake: Add remake-native and remake

Yao Zhao (1):
  busybox: fix the problem that mkfs.minix.tests fails on big endian
    platform

 meta/classes/core-image.bbclass                    |    2 -
 meta/classes/kernel.bbclass                        |    5 ++-
 meta/classes/license.bbclass                       |    2 +-
 meta/classes/package.bbclass                       |    6 ++-
 meta/classes/package_deb.bbclass                   |    1 +
 meta/classes/qemu.bbclass                          |    2 +
 meta/conf/distro/include/default-distrovars.inc    |    1 +
 meta/conf/distro/include/tcmode-default.inc        |    2 +-
 meta/recipes-connectivity/dhcp/dhcp.inc            |    2 +
 meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb    |    2 +-
 meta/recipes-connectivity/libpcap/libpcap.inc      |    3 +-
 .../busybox-mkfs-minix-tests_bigendian.patch       |   34 ++++++++++++++
 meta/recipes-core/busybox/busybox_1.19.4.bb        |    5 +-
 meta/recipes-core/busybox/files/simple.script      |    3 +-
 .../eglibc/eglibc-2.16/GLRO_dl_debug_mask.patch    |   48 ++++++++++++++-----
 .../eglibc-2.16/fileops-without-wchar-io.patch     |   22 +++++++++
 meta/recipes-core/eglibc/eglibc-initial.inc        |    1 +
 meta/recipes-core/eglibc/eglibc-initial_2.16.bb    |    9 +++-
 meta/recipes-core/eglibc/eglibc_2.16.bb            |    3 +-
 .../initscripts-1.0/populate-volatile.sh           |    4 +-
 meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 +-
 meta/recipes-core/libcgroup/libcgroup_0.37.1.bb    |   27 +++++++++++
 meta/recipes-core/meta/package-index.bb            |    2 +
 .../binutils/binutils/binutils-armv5e.patch        |    4 ++
 meta/recipes-devtools/gcc/gcc-4.7.inc              |    2 +-
 meta/recipes-devtools/gcc/gcc-cross-initial.inc    |   10 ++++
 .../ossp-uuid/0001-Change-library-name.patch       |    7 +++
 ...erve-m-option-status-in-v-option-handling.patch |    7 +++
 .../ossp-uuid/0003-Fix-whatis-entries.patch        |    7 +++
 .../ossp-uuid/0004-fix-data-uuid-from-string.patch |    7 +++
 .../ossp-uuid/ossp-uuid/uuid-libtool.patch         |    3 +
 .../ossp-uuid/ossp-uuid/uuid-nostrip.patch         |    3 +
 meta/recipes-devtools/remake/remake.inc            |   16 +++++++
 .../remake/remake/version-remake.texi.patch        |   16 +++++++
 meta/recipes-devtools/remake/remake_git.bb         |   25 ++++++++++
 meta/recipes-devtools/rpm/rpm/rpm-lua.patch        |    2 +
 meta/recipes-devtools/rpm/rpm/rpm-macros.patch     |    2 +
 .../rpm/rpm/rpm-no-perl-urpm.patch                 |    2 +
 meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch  |    2 +
 .../rpm/rpm/rpm-packageorigin.patch                |    2 +
 .../rpm/rpm/rpm-pkgconfigdeps.patch                |    2 +
 meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch |    2 +
 meta/recipes-extended/bash/bash.inc                |   13 +++--
 meta/recipes-extended/bash/bash_4.2.bb             |    2 +-
 .../cups/cups-1.4.6/cups_serverbin.patch           |   32 +++++++++++++
 meta/recipes-extended/cups/cups14.inc              |   26 +++++-----
 meta/recipes-extended/cups/cups_1.4.6.bb           |    7 ++-
 .../libzypp/libzypp/libzypp-rpm549.patch           |    4 ++
 .../shadow/shadow-native_4.1.4.3.bb                |    5 ++-
 meta/recipes-extended/shadow/shadow_4.1.4.3.bb     |    5 ++-
 meta/recipes-graphics/xorg-app/xinit_1.3.2.bb      |    2 -
 meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb      |    2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb    |    8 ++--
 meta/recipes-kernel/linux/linux-yocto_3.4.bb       |   16 +++---
 meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb       |    4 +-
 .../createrepo/createrepo/createrepo-rpm549.patch  |    3 +
 56 files changed, 365 insertions(+), 73 deletions(-)
 create mode 100644 meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch
 create mode 100644 meta/recipes-core/eglibc/eglibc-2.16/fileops-without-wchar-io.patch
 create mode 100644 meta/recipes-core/libcgroup/libcgroup_0.37.1.bb
 create mode 100644 meta/recipes-devtools/remake/remake.inc
 create mode 100644 meta/recipes-devtools/remake/remake/version-remake.texi.patch
 create mode 100644 meta/recipes-devtools/remake/remake_git.bb
 create mode 100644 meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch

-- 
1.7.7.6

[CONSOLIDATED PULL 01/28] initscripts: don't bg mk_dirs in populate-volatile

[Saul Wold]

From: Christopher Larson <chris_larson@mentor.com>

If a directory needs to be created to create something else in volatiles,
there's no guarantees on ordering due to the backgrounding. We can't guarantee
with certainty that the create directory commands are complete before the
later ones run. This ensures that we wait for directory creations to complete
before we proceed.

Chris Hallinan hit an actual failure due to this back in March of last year.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../initscripts-1.0/populate-volatile.sh           |    4 ++--
 meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index 4a99aff..d2175d7 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -42,7 +42,7 @@ mk_dir() {
 	[ -e "$1" ] && {
 	  [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
 	} || {
-	  eval $EXEC &
+	  eval $EXEC
 	}
 }
 
@@ -153,7 +153,7 @@ apply_cfgfile() {
             create_file "${TNAME}" &
 	    ;;
       "d")  [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-."
-            mk_dir "${TNAME}" &
+            mk_dir "${TNAME}"
 	    # Add check to see if there's an entry in fstab to mount.
 	    ;;
       *)    [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-."
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 1d80c55..b741b61 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip
 SECTION = "base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r135"
+PR = "r136"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-- 
1.7.7.6

[CONSOLIDATED PULL 02/28] libpcap: fix pcap-config to not return -Wl, -rpath

[Saul Wold]

From: Christopher Larson <chris_larson@mentor.com>

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-connectivity/libpcap/libpcap.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 427078f..7d4e841 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -13,7 +13,7 @@ DEPENDS = "flex-native bison-native"
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
 PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz"
 
@@ -29,4 +29,5 @@ do_configure_prepend () {
     if [ ! -e acinclude.m4 ]; then
         cat aclocal.m4 > acinclude.m4
     fi
+    sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in
 }
-- 
1.7.7.6

[CONSOLIDATED PULL 03/28] tcmode-default: Bump EGLIBC Version to 2.16

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/conf/distro/include/tcmode-default.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 0a068be..2bfa225 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -20,7 +20,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
 GCCVERSION ?= "4.7%"
 SDKGCCVERSION ?= "${GCCVERSION}"
 BINUVERSION ?= "2.22"
-EGLIBCVERSION ?= "2.15"
+EGLIBCVERSION ?= "2.16"
 UCLIBCVERSION ?= "0.9.33"
 LINUXLIBCVERSION ?= "3.4.3"
 
-- 
1.7.7.6

[CONSOLIDATED PULL 04/28] bash: enable parallel build

[Saul Wold]

From: Otavio Salvador <otavio@ossystems.com.br>

I've build it several times in a 8 core machine without problem so it
seems safe to use parallel build now.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/bash/bash.inc    |    2 --
 meta/recipes-extended/bash/bash_4.2.bb |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index ff9b0ce..6d7e930 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -9,8 +9,6 @@ DEPENDS = "ncurses bison-native"
 
 inherit autotools gettext update-alternatives
 
-PARALLEL_MAKE = ""
-
 bindir = "/bin"
 sbindir = "/sbin"
 
diff --git a/meta/recipes-extended/bash/bash_4.2.bb b/meta/recipes-extended/bash/bash_4.2.bb
index e96709a..a28279e 100644
--- a/meta/recipes-extended/bash/bash_4.2.bb
+++ b/meta/recipes-extended/bash/bash_4.2.bb
@@ -1,6 +1,6 @@
 require bash.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \
            ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 \
-- 
1.7.7.6

[CONSOLIDATED PULL 05/28] bash: fix warning about bashbug reference /usr/bin when installed in /bin

[Saul Wold]

From: Otavio Salvador <otavio@ossystems.com.br>

Change the installation process so we have bashbug in ${bindir} and
bash at ${base_bindir}.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/bash/bash.inc    |   11 ++++++++---
 meta/recipes-extended/bash/bash_4.2.bb |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 6d7e930..a7f5f8f 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -9,9 +9,6 @@ DEPENDS = "ncurses bison-native"
 
 inherit autotools gettext update-alternatives
 
-bindir = "/bin"
-sbindir = "/sbin"
-
 EXTRA_OECONF = "--enable-job-control"
 export CC_FOR_BUILD = "${BUILD_CC}"
 
@@ -28,6 +25,14 @@ do_configure_prepend () {
 	fi
 }
 
+do_install_append () {
+	# Move /usr/bin/bash to /bin/bash, if need
+	if [ "${base_bindir}" != "${bindir}" ]; then
+		mkdir -p ${D}${base_bindir}
+		mv ${D}${bindir}/bash ${D}${base_bindir}
+	fi
+}
+
 pkg_postinst_${PN} () {
 	touch $D${sysconfdir}/shells
 	grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells
diff --git a/meta/recipes-extended/bash/bash_4.2.bb b/meta/recipes-extended/bash/bash_4.2.bb
index a28279e..50f2ff6 100644
--- a/meta/recipes-extended/bash/bash_4.2.bb
+++ b/meta/recipes-extended/bash/bash_4.2.bb
@@ -1,6 +1,6 @@
 require bash.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \
            ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 \
-- 
1.7.7.6

[CONSOLIDATED PULL 06/28] kernel.bbclass: fix external module building

[Saul Wold]

From: Denis Carikli <GNUtoo@no-log.org>

Without that fix we have the following while compiling compat-wireless.
  include/linux/mmzone.h:18:30: fatal error: generated/bounds.h: No such file or directory

Note that the compat-wireless recipe will be added in another commit.

make -C $kerneldir _mrproper_scripts deleted this file along with
other things so we resurrect it with this patch.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/kernel.bbclass |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 08b5e61..ce4d7de 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -187,6 +187,9 @@ kernel_do_install() {
 		cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
 	fi
 
+	# Necessary for building modules like compat-wireless.
+	cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
+
 	# Remove the following binaries which cause strip or arch QA errors
 	# during do_package for cross-compiled platforms
 	bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
-- 
1.7.7.6

Re: [CONSOLIDATED PULL 06/28] kernel.bbclass: fix external module building

[Leon Woestenberg]

[-- Attachment #1: Type: text/plain, Size: 414 bytes --]

Hello Saul,

On Wed, Jul 25, 2012 at 9:19 AM, Saul Wold <sgw@linux.intel.com> wrote:

> +       # Necessary for building modules like compat-wireless.
> +       cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
> +
>

Thanks, can we get this merged into the Denzil branch as well?

In general, how are commits selected for release branches?

Regards,

Leon 'likewise' Woestenberg

[-- Attachment #2: Type: text/html, Size: 679 bytes --]

Re: [CONSOLIDATED PULL 06/28] kernel.bbclass: fix external module building

[Saul Wold]

On 07/26/2012 10:21 AM, Leon Woestenberg wrote:
> Hello Saul,
>
Please check with Scott Garman (cc'ed) he is the stable maintainer for 
1.2.1 (Denzil).

Sau!

> On Wed, Jul 25, 2012 at 9:19 AM, Saul Wold <sgw@linux.intel.com
> <mailto:sgw@linux.intel.com>> wrote:
>
>     +       # Necessary for building modules like compat-wireless.
>     +       cp include/generated/bounds.h
>     $kerneldir/include/generated/bounds.h
>     +
>
>
> Thanks, can we get this merged into the Denzil branch as well?
>
> In general, how are commits selected for release branches?
>
> Regards,
>
> Leon 'likewise' Woestenberg
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

[CONSOLIDATED PULL 07/28] shadow-native: use 'users' group by default

[Saul Wold]

From: Otavio Salvador <otavio@ossystems.com.br>

The rootfs has 'users' group at number 100 and without this fix it
would assign to a non-existent group and if a group with gid as 1000
is created later it would own all files for users created.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../shadow/shadow-native_4.1.4.3.bb                |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
index 1e071f1..cd5605f 100644
--- a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
@@ -7,7 +7,7 @@ LICENSE = "BSD | Artistic-1.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
                     file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe"
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
            file://shadow.automake-1.11.patch \
@@ -46,4 +46,7 @@ do_install_append() {
 	# Now we don't have a mail system. Disable mail creation for now.
 	sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd
 	sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd
+
+	# Use users group by default
+	sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd
 }
-- 
1.7.7.6

[CONSOLIDATED PULL 08/28] shadow: use 'users' group by default

[Saul Wold]

From: Otavio Salvador <otavio@ossystems.com.br>

The rootfs has 'users' group at number 100 and without this fix it
would assign to a non-existent group and if a group with gid as 1000
is created later it would own all files for users created.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/shadow/shadow_4.1.4.3.bb |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index 506f4e6..de10f64 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
 
 DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
            file://login_defs_pam.sed \
@@ -85,6 +85,9 @@ do_install_append() {
 	sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd
 	sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd
 
+	# Use users group by default
+	sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd
+
 	install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} 
 
 	# Move binaries to the locations we want
-- 
1.7.7.6

[CONSOLIDATED PULL 09/28] linux-yocto/3.4: 3.4.6 and 3.4.x-rt14

[Saul Wold]

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

Updating the 3.4 kernel to the latest -stable release and updating preempt-rt
to 3.4.4-rt14.

Tested on qemu*

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto_3.4.bb    |   16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index 97a1a19..3e7952d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-LINUX_VERSION ?= "3.4.4"
+LINUX_VERSION ?= "3.4.6"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "b25f7c9730e3bd3be1bf7b7982251b7459ad6579"
-SRCREV_machine_qemuppc ?= "2777125ab6f92b624ecaf11d6b1ab604e64497a8"
-SRCREV_meta ?= "949fddda61053cc15e46c015e8f7db17e7b33360"
+SRCREV_machine ?= "2d008a6dcbf565878cee14c5f050eca53897316f"
+SRCREV_machine_qemuppc ?= "94d25f958b6dfb1e8009a0feea7ab4c9a8f54a99"
+SRCREV_meta ?= "d7a96809a585e06933d8c08adb9b9f66b21efb4c"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index f031e1b..f3867f7 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -10,17 +10,17 @@ KBRANCH_qemumips64 = "standard/mti-malta64"
 KBRANCH_qemumips64el = "standard/mti-malta64"
 KBRANCH_qemuarm  = "standard/arm-versatile-926ejs"
 
-SRCREV_machine_qemuarm ?= "9aca8fec49787efbe44d0f137f31ee59edd94c49"
-SRCREV_machine_qemumips  ?= "23fa942849b1207dbfc4528e2a5c8df0fd71870c"
-SRCREV_machine_qemuppc ?= "08732f25bc3cb404e29ae201074bcf5c1661ea83"
-SRCREV_machine_qemux86 ?= "6297e4c1d57e1063bfce297c2e12392348598559"
-SRCREV_machine_qemux86-64 ?= "6297e4c1d57e1063bfce297c2e12392348598559"
-SRCREV_machine ?= "6297e4c1d57e1063bfce297c2e12392348598559"
-SRCREV_meta ?= "949fddda61053cc15e46c015e8f7db17e7b33360"
+SRCREV_machine_qemuarm ?= "b57548a29e44655e27cfbdf3a0642d682401b835"
+SRCREV_machine_qemumips  ?= "633d487b0f6e5d328400b47f0d69d9dac7354c84"
+SRCREV_machine_qemuppc ?= "6229fc0f62283e0dc9f8b5d2be01b048a92867f3"
+SRCREV_machine_qemux86 ?= "19f7e43b54aef08d58135ed2a897d77b624b320a"
+SRCREV_machine_qemux86-64 ?= "19f7e43b54aef08d58135ed2a897d77b624b320a"
+SRCREV_machine ?= "19f7e43b54aef08d58135ed2a897d77b624b320a"
+SRCREV_meta ?= "d7a96809a585e06933d8c08adb9b9f66b21efb4c"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
 
-LINUX_VERSION ?= "3.4.4"
+LINUX_VERSION ?= "3.4.6"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
-- 
1.7.7.6

[CONSOLIDATED PULL 10/28] dhcp: remove dependency of dev/staticdev packages on main package

[Saul Wold]

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

The main package is empty and is not produced, which leaves the dev
and staticdev packages broken. Remove the dependencies (added in
bitbake.conf by default) to fix this.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-connectivity/dhcp/dhcp.inc         |    2 ++
 meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index 8ead016..3159f93 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -56,6 +56,8 @@ do_install_append () {
 PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
 
 FILES_${PN} = ""
+RDEPENDS_${PN}-dev = ""
+RDEPENDS_${PN}-staticdev = ""
 
 FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
 RRECOMMENDS_dhcp-server = "dhcp-server-config"
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb
index 24b50ba..67af3e2 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb
@@ -1,6 +1,6 @@
 require dhcp.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://fixincludes.patch \
             file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
-- 
1.7.7.6

[CONSOLIDATED PULL 11/28] libxp: Change superfluous "+=" to simple "=" when using _append

[Saul Wold]

From: "Robert P. J. Day" <rpjday@crashcourse.ca>

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb b/meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb
index 349dad1..dbd4609 100644
--- a/meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb
@@ -15,7 +15,7 @@ PE = "1"
 
 XORG_PN = "libXp"
 
-CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+CFLAGS_append = " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
 
 SRC_URI += "file://fix-cast-error.patch"
 
-- 
1.7.7.6

[CONSOLIDATED PULL 12/28] webkit-gtk: Replace superfluous "+=" with "=", and add leading space

[Saul Wold]

From: "Robert P. J. Day" <rpjday@crashcourse.ca>

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
index 229273f..dd43811 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
@@ -47,9 +47,9 @@ EXTRA_OECONF = "\
                "
 
 #default unicode backend icu breaks in cross-compile when target and host are different endian type
-EXTRA_OECONF_append_powerpc += "--with-unicode-backend=glib"
+EXTRA_OECONF_append_powerpc = " --with-unicode-backend=glib"
 
-CPPFLAGS_append_powerpc += "-I${STAGING_INCDIR}/pango-1.0 \
+CPPFLAGS_append_powerpc = " -I${STAGING_INCDIR}/pango-1.0 \
                             -I${STAGING_LIBDIR}/glib-2.0/include \
                             -I${STAGING_INCDIR}/glib-2.0"
 
-- 
1.7.7.6

[CONSOLIDATED PULL 13/28] qemu.bbclass: Map the qemu binary name for powerpc64

[Saul Wold]

From: Khem Raj <raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/qemu.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 68896ce..aead8e2 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -9,5 +9,7 @@ def qemu_target_binary(data):
         target_arch = "i386"
     elif target_arch == "powerpc":
         target_arch = "ppc"
+    elif target_arch == "powerpc64":
+        target_arch = "ppc64"
 
     return "qemu-" + target_arch
-- 
1.7.7.6

[CONSOLIDATED PULL 14/28] cups_1.4.6.bb: Fix build on ppc64

[Saul Wold]

From: Khem Raj <raj.khem@gmail.com>

ppc64 uses lib64 and usr/lib64 for library paths
so we need to train cups build system

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../cups/cups-1.4.6/cups_serverbin.patch           |   32 ++++++++++++++++++++
 meta/recipes-extended/cups/cups14.inc              |   26 ++++++++--------
 meta/recipes-extended/cups/cups_1.4.6.bb           |    7 ++--
 3 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch

diff --git a/meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch b/meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch
new file mode 100644
index 0000000..f7b44a7
--- /dev/null
+++ b/meta/recipes-extended/cups/cups-1.4.6/cups_serverbin.patch
@@ -0,0 +1,32 @@
+Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches
+e.g. ppc64 where base libdir is lib64 this does not go well
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Inappropriate [OE config specific]
+
+Index: cups-1.4.6/config-scripts/cups-directories.m4
+===================================================================
+--- cups-1.4.6.orig/config-scripts/cups-directories.m4	2009-04-12 16:04:51.000000000 -0700
++++ cups-1.4.6/config-scripts/cups-directories.m4	2012-07-21 12:12:05.896405923 -0700
+@@ -397,7 +397,7 @@
+ 	*)
+ 		# All others
+ 		INSTALL_SYSV="install-sysv"
+-		CUPS_SERVERBIN="$exec_prefix/lib/cups"
++		CUPS_SERVERBIN="$libdir/cups"
+ 		;;
+ esac
+ 
+Index: cups-1.4.6/configure
+===================================================================
+--- cups-1.4.6.orig/configure	2012-07-21 12:13:34.512405950 -0700
++++ cups-1.4.6/configure	2012-07-21 12:14:05.724406017 -0700
+@@ -11181,7 +11181,7 @@
+ 	*)
+ 		# All others
+ 		INSTALL_SYSV="install-sysv"
+-		CUPS_SERVERBIN="$exec_prefix/lib/cups"
++		CUPS_SERVERBIN="$libdir/cups"
+ 		;;
+ esac
+ 
diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc
index 4f2b0a1..0517007 100644
--- a/meta/recipes-extended/cups/cups14.inc
+++ b/meta/recipes-extended/cups/cups14.inc
@@ -27,7 +27,7 @@ EXTRA_OECONF = " \
 do_configure() {
 	gnu-configize
 	libtoolize --force
-	DSOFLAGS="${LDFLAGS}" oe_runconf
+	DSOFLAGS="${LDFLAGS}" SERVERBIN="${libdir}/cups" oe_runconf
 }
 
 do_compile () {
@@ -66,24 +66,24 @@ python do_package_append() {
 
 PACKAGES =+ "${PN}-lib ${PN}-libimage"
 
-FILES_${PN} += "${exec_prefix}/lib/cups/backend \
-		${exec_prefix}/lib/cups/cgi-bin \
-		${exec_prefix}/lib/cups/filter \
-		${exec_prefix}/lib/cups/monitor \
-		${exec_prefix}/lib/cups/notifier \
-		${exec_prefix}/lib/cups/daemon \
+FILES_${PN} += "${libdir}/cups/backend \
+		${libdir}/cups/cgi-bin \
+		${libdir}/cups/filter \
+		${libdir}/cups/monitor \
+		${libdir}/cups/notifier \
+		${libdir}/cups/daemon \
 	       "
 
 FILES_${PN}-lib = "${libdir}/libcups.so.*"
 
 FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
 
-FILES_${PN}-dbg += "${exec_prefix}/lib/cups/backend/.debug \
-                    ${exec_prefix}/lib/cups/cgi-bin/.debug \
-                    ${exec_prefix}/lib/cups/filter/.debug \
-                    ${exec_prefix}/lib/cups/monitor/.debug \
-                    ${exec_prefix}/lib/cups/notifier/.debug \
-                    ${exec_prefix}/lib/cups/daemon/.debug \
+FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
+                    ${libdir}/cups/cgi-bin/.debug \
+                    ${libdir}/cups/filter/.debug \
+                    ${libdir}/cups/monitor/.debug \
+                    ${libdir}/cups/notifier/.debug \
+                    ${libdir}/cups/daemon/.debug \
                    "
 
 #package the html for the webgui inside the main packages (~1MB uncompressed)
diff --git a/meta/recipes-extended/cups/cups_1.4.6.bb b/meta/recipes-extended/cups/cups_1.4.6.bb
index 9825138..8485180 100644
--- a/meta/recipes-extended/cups/cups_1.4.6.bb
+++ b/meta/recipes-extended/cups/cups_1.4.6.bb
@@ -1,13 +1,14 @@
 require cups14.inc
 
-PR = "r4"
+PR = "r5"
 DEPENDS += "libusb \
        ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=956e7600195e6139f12de8c2a5bbefa9"
 SRC_URI += " \
-	file://use_echo_only_in_init.patch \
-    file://0001-don-t-try-to-run-generated-binaries.patch \
+            file://use_echo_only_in_init.patch \
+            file://0001-don-t-try-to-run-generated-binaries.patch \
+            file://cups_serverbin.patch \
 	"
 
 SRC_URI[md5sum] = "de8fb5a29c36554925c0c6a6e2c0dae1"
-- 
1.7.7.6

[CONSOLIDATED PULL 15/28] remake: Add remake-native and remake

[Saul Wold]

From: Wenzong Fan <wenzong.fan@windriver.com>

remake is a patched version of GNU Make that adds improved error
reporting, the ability to trace execution in a comprehensible way,
and a debugger.

[YOCTO #2402]

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/remake/remake.inc            |   16 ++++++++++++
 .../remake/remake/version-remake.texi.patch        |   16 ++++++++++++
 meta/recipes-devtools/remake/remake_git.bb         |   25 ++++++++++++++++++++
 3 files changed, 57 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/remake/remake.inc
 create mode 100644 meta/recipes-devtools/remake/remake/version-remake.texi.patch
 create mode 100644 meta/recipes-devtools/remake/remake_git.bb

diff --git a/meta/recipes-devtools/remake/remake.inc b/meta/recipes-devtools/remake/remake.inc
new file mode 100644
index 0000000..6ac833e
--- /dev/null
+++ b/meta/recipes-devtools/remake/remake.inc
@@ -0,0 +1,16 @@
+SUMMARY = "Makefile debugger which is gnumake 3.81 compatible"
+DESCRIPTION = "remake is a patched and modernized version of GNU make \
+utility that adds improved error reporting, the ability to trace \
+execution in a comprehensible way, and a debugger."
+
+HOMEPAGE = "http://bashdb.sourceforge.net/remake/"
+SECTION = "devel"
+
+SRC_URI = "git://github.com/rocky/remake.git"
+
+inherit autotools gettext update-alternatives
+
+ALTERNATIVE_${PN} = "make"
+ALTERNATIVE_LINK_NAME[make] = "${bindir}/make"
+ALTERNATIVE_TARGET[make] = "${bindir}/remake"
+ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-devtools/remake/remake/version-remake.texi.patch b/meta/recipes-devtools/remake/remake/version-remake.texi.patch
new file mode 100644
index 0000000..fa6329e
--- /dev/null
+++ b/meta/recipes-devtools/remake/remake/version-remake.texi.patch
@@ -0,0 +1,16 @@
+Upstream-Status: Pending
+
+version-remake.texi is not there but it is required by remake.texi,
+just add it for getting the 'make remake.info' works.
+
+==============================================================
+diff --git a/doc/version-remake.texi b/doc/version-remake.texi
+new file mode 100644
+index 0000000..2a3b72b
+--- /dev/null
++++ b/doc/version-remake.texi
+@@ -0,0 +1,4 @@
++@set UPDATED 10 June 2012
++@set UPDATED-MONTH June 2012
++@set EDITION 3.82+dbg-0.9git
++@set VERSION 3.82+dbg-0.9git
diff --git a/meta/recipes-devtools/remake/remake_git.bb b/meta/recipes-devtools/remake/remake_git.bb
new file mode 100644
index 0000000..7e9857e9
--- /dev/null
+++ b/meta/recipes-devtools/remake/remake_git.bb
@@ -0,0 +1,25 @@
+PR = "r0"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4"
+require remake.inc
+
+SRC_URI += "file://version-remake.texi.patch"
+SRCREV = "414d6e84121c6740ff5079370c905dea0f0e1ddb"
+S = "${WORKDIR}/git"
+
+DEPENDS += "readline"
+PROVIDES += "make"
+
+do_configure_prepend() {
+    # create config.rpath which required by configure.ac
+    autopoint || touch config.rpath
+}
+
+do_compile_prepend() {
+    # updating .po and other gnu build files
+    make update
+}
+
+BBCLASSEXTEND = "native"
-- 
1.7.7.6

[CONSOLIDATED PULL 16/28] libcgroup_0.37.1.bb: Add recipe

[Saul Wold]

From: Khem Raj <raj.khem@gmail.com>

This recipe is imported from meta-oe its a requirement for
systemd to work. Now that systemd is living in a layer of
its own. Lets have this recipe into core metadata

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/libcgroup/libcgroup_0.37.1.bb |   27 +++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-core/libcgroup/libcgroup_0.37.1.bb

diff --git a/meta/recipes-core/libcgroup/libcgroup_0.37.1.bb b/meta/recipes-core/libcgroup/libcgroup_0.37.1.bb
new file mode 100644
index 0000000..a99d7ac
--- /dev/null
+++ b/meta/recipes-core/libcgroup/libcgroup_0.37.1.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Libcgroup"
+SECTION = "libs"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+PR = "r1"
+
+inherit autotools pkgconfig
+
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${PN}/v${PV}/${PN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "24a41b18de112e8d085bb1f7d9e82af7"
+SRC_URI[sha256sum] = "0b08632de5d3641aa554b422d02a77d9367e57933328a8765204ad9588cd5c0d"
+
+EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes', '--enable-pam=no', d)}"
+
+# http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg21444.html
+PARALLEL_MAKE = ""
+
+PACKAGES =+ "cgroups-pam-plugin"
+FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*"
+FILES_${PN}-dbg += "${base_libdir}/security/.debug"
+FILES_${PN}-dev += "${base_libdir}/security/*.la"
+
+# We really need the symlink so :(
+INSANE_SKIP_${PN} = "dev-so"
-- 
1.7.7.6

[CONSOLIDATED PULL 17/28] kernel bbclass: Recreate uImage only when KEEPUIMAGE != "yes"

[Saul Wold]

From: Koen Kooi <koen@dominion.thruhere.net>

The intent of the uImage code in this class includes the following

1) be able to specify custom load addresses without needing to patch the kernel
2) add better information to the uImage description field

The current state is a NOP anyway, the kernel will always build a uImage when you tell it to 'make uImage'.

weakly Set KEEPUIMAGE to 'yes' in default-distrovars.inc which preserve the
current OE-Core behavior. Machines which are being ported from oe.dev and need to
regenerate uImage can set this to be empty

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/kernel.bbclass                     |    2 +-
 meta/conf/distro/include/default-distrovars.inc |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index ce4d7de..ab984e3 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -507,7 +507,7 @@ KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
 
 do_uboot_mkimage() {
 	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
-		if test ! -e arch/${ARCH}/boot/uImage ; then
+		if test "x${KEEPUIMAGE}" != "xyes" ; then
 			ENTRYPOINT=${UBOOT_ENTRYPOINT}
 			if test -n "${UBOOT_ENTRYSYMBOL}"; then
 				ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index f770919..ef8232d 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -2,6 +2,7 @@ QA_LOGFILE = "${TMPDIR}/qa.log"
 
 OEINCLUDELOGS ?= "yes"
 KERNEL_CONSOLE ?= "ttyS0"
+KEEPUIMAGE ??= "yes"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-- 
1.7.7.6

[CONSOLIDATED PULL 18/28] package.bbclass: Create symlinks for packages with different packaged name

[Saul Wold]

From: Andrei Gherzan <andrei@gherzan.ro>

While generating license.manifest package information is searched in:
filename=`ls ${TMPDIR}/pkgdata/*/runtime/${pkg}| head -1`
This is ok as long as package name is the same as the package name
after packaging.
For example dbus is packaged as dbus-1. So, searching
ls ${TMPDIR}/pkgdata/*/runtime/dbus-1 will fail because there is no file
with this package name.

Create a symlink to the pkgdata file in a runtime-reverse directory so
that these reverse lookups are possible.

Fixes [YOCTO #2638].

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/license.bbclass |    2 +-
 meta/classes/package.bbclass |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index a2721ab..231b4a3 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -86,7 +86,7 @@ license_create_manifest() {
 	# list of installed packages is broken for deb
 	for pkg in ${INSTALLED_PKGS}; do
 		# not the best way to do this but licenses are not arch dependant iirc
-		filename=`ls ${TMPDIR}/pkgdata/*/runtime/${pkg}| head -1`
+		filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/${pkg}| head -1`
 		pkged_pn="$(sed -n 's/^PN: //p' ${filename})"
 		pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/  */ /g; p }' ${filename})"
 		pkged_pv="$(sed -n 's/^PV: //p' ${filename})"
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index fc83424..ea199d3 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1124,6 +1124,10 @@ python emit_pkgdata() {
         sf.write('%s_%s: %s\n' % ('PKGSIZE', pkg, get_directory_size(pkgdest + "/%s" % pkg)))
         sf.close()
 
+        # Symlinks needed for reverse lookups (from the final package name)
+        pkgval = d.getVar('PKG_%s' % (pkg), True)
+        subdata_sym = pkgdatadir + "/runtime-reverse/%s" % pkgval
+        oe.path.symlink("../runtime/%s" % pkg, subdata_sym, True)
 
         allow_empty = d.getVar('ALLOW_EMPTY_%s' % pkg, True)
         if not allow_empty:
@@ -1137,7 +1141,7 @@ python emit_pkgdata() {
 
     bb.utils.unlockfile(lf)
 }
-emit_pkgdata[dirs] = "${PKGDESTWORK}/runtime"
+emit_pkgdata[dirs] = "${PKGDESTWORK}/runtime ${PKGDESTWORK}/runtime-reverse"
 
 ldconfig_postinst_fragment() {
 if [ x"$D" = "x" ]; then
-- 
1.7.7.6

[CONSOLIDATED PULL 19/28] classes/package_deb: add PackageArch field

[Saul Wold]

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

If we want to query the PACKAGE_ARCH from the installed package (as we
do in order to be able to do a pkgdata lookup for example) then we need
to have this stored in its own field as this is not always the same as
the Architecture field for deb packages.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/package_deb.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index d09baea..48511df 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -290,6 +290,7 @@ python do_package_deb () {
         fields.append(["Maintainer: %s\n", ['MAINTAINER']])
         fields.append(["Architecture: %s\n", ['DPKG_ARCH']])
         fields.append(["OE: %s\n", ['PN']])
+        fields.append(["PackageArch: %s\n", ['PACKAGE_ARCH']])
         fields.append(["Homepage: %s\n", ['HOMEPAGE']])
 
         # Package, Version, Maintainer, Description - mandatory
-- 
1.7.7.6

[CONSOLIDATED PULL 20/28] eglibc-initial: Fix build failure due to missing limits.h

[Saul Wold]

From: Khem Raj <raj.khem@gmail.com>

We have had these things in place to overcome a limitation
from our gcc-initial-cross not staging a self sufficient
limits.h. Now thats fixed we do reset TOOLCHAIN_OPTIONS
to point to sysroot where linux kernel headers are staged
and not the bootstrap sysroot which will infact be popuated
by eglibc-initial itself.

Secondly we dont need to set CPPFLAGS specially as we
are doing that in eglibc.inc so we override that

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/eglibc/eglibc-initial.inc     |    1 +
 meta/recipes-core/eglibc/eglibc-initial_2.16.bb |    9 ++++++---
 meta/recipes-core/eglibc/eglibc_2.16.bb         |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc
index 9062516..1020e40 100644
--- a/meta/recipes-core/eglibc/eglibc-initial.inc
+++ b/meta/recipes-core/eglibc/eglibc-initial.inc
@@ -8,6 +8,7 @@ PACKAGES_DYNAMIC = ""
 
 STAGINGCC = "gcc-cross-initial"
 STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
+TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"
 
 do_configure () {
 	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
diff --git a/meta/recipes-core/eglibc/eglibc-initial_2.16.bb b/meta/recipes-core/eglibc/eglibc-initial_2.16.bb
index 787c762..f6b09ac 100644
--- a/meta/recipes-core/eglibc/eglibc-initial_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc-initial_2.16.bb
@@ -1,6 +1,9 @@
 require eglibc_${PV}.bb
 require eglibc-initial.inc
 
-do_configure_prepend () {
-        unset CFLAGS
-}
+# main eglibc recipes muck with TARGET_CPPFLAGS to point into
+# final target sysroot but we
+# are not there when building eglibc-initial
+# so reset it here
+
+TARGET_CPPFLAGS = ""
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index b76d943..fc3d82b 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "19383"
 
 DEPENDS += "gperf-native"
-PR = "r1"
+PR = "r2"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_16"
-- 
1.7.7.6

[CONSOLIDATED PULL 21/28] gcc-cross-initial: Stage self sufficient fixed limits.h

[Saul Wold]

From: Khem Raj <raj.khem@gmail.com>

currently gcc installs a limits.h which references to another
limits.h which it expects from target sysroot and that header
in target sysroot will come from eglibc. So we need to break
this catch-22 and hence we install a self sufficient limits.h
which is then happy when referenced and doesnt complain about
missing limits.h from target sysroot.

This is mostly used when eglibc-initial configure is run

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/gcc/gcc-4.7.inc           |    2 +-
 meta/recipes-devtools/gcc/gcc-cross-initial.inc |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 43d77ec..709d7d8 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@
 require gcc-common.inc
 
-PR = "r7"
+PR = "r8"
 
 # Third digit in PV should be incremented after a minor release
 # happens from this branch on gcc e.g. currently its 4.7.1
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 93a6d78..aee46a6 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -27,3 +27,13 @@ EXTRA_OECONF = "--with-newlib \
 do_compile () {
     oe_runmake all-gcc all-target-libgcc
 }
+# fixed limits.h infact includes the so called real limits.h
+# which should come from libc but when we build libc-initial
+# then bunch of configure tests include fixed limits.h which in turn
+# includes real limits.h but this real limits.h is not staged yet
+# so we overwirte the generated include-fixed/limits.h for gcc-cross-initial
+# to get rid references to real limits.h
+
+do_install_append1() {
+    cp gcc/include-fixed/limits.h ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed/limits.h
+}
-- 
1.7.7.6

[CONSOLIDATED PULL 22/28] eglibc: Fix build when OPTION_POSIX_WIDE_CHAR_DEVICE_IO is not set

[Saul Wold]

From: Khem Raj <raj.khem@gmail.com>

poky-tiny disables certain eglibc options which gives good excercise
for eglibc's componentized builds. This patch essentially updates the
GLRO patch to account for additions of GLRO(dl_debug_mask) and
converts them to GLRO_dl_debug_mask

Secondly adds a new patch where it was creating a undefined alias
because we were using INTUSE macro which got exposed when we
disable OPTION_POSIX_WIDE_CHAR_DEVICE_IO

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../eglibc/eglibc-2.16/GLRO_dl_debug_mask.patch    |   48 ++++++++++++++-----
 .../eglibc-2.16/fileops-without-wchar-io.patch     |   22 +++++++++
 meta/recipes-core/eglibc/eglibc_2.16.bb            |    3 +-
 3 files changed, 59 insertions(+), 14 deletions(-)
 create mode 100644 meta/recipes-core/eglibc/eglibc-2.16/fileops-without-wchar-io.patch

diff --git a/meta/recipes-core/eglibc/eglibc-2.16/GLRO_dl_debug_mask.patch b/meta/recipes-core/eglibc/eglibc-2.16/GLRO_dl_debug_mask.patch
index b899562..99cd812 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/GLRO_dl_debug_mask.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.16/GLRO_dl_debug_mask.patch
@@ -6,9 +6,9 @@ Singed-off-by: Khem Raj <raj.khem@gmail.com>
 Upstream-Status: Pending
 Index: libc/elf/dl-open.c
 ===================================================================
---- libc.orig/elf/dl-open.c	2012-03-09 08:54:34.691443995 -0800
-+++ libc/elf/dl-open.c	2012-03-09 08:55:31.275446730 -0800
-@@ -154,7 +154,7 @@
+--- libc.orig/elf/dl-open.c	2012-07-04 18:26:34.000000000 -0700
++++ libc/elf/dl-open.c	2012-07-23 22:55:10.700072511 -0700
+@@ -153,7 +153,7 @@
  	  ns->_ns_main_searchlist->r_list[new_nlist++] = map;
  
  	  /* We modify the global scope.  Report this.  */
@@ -17,7 +17,7 @@ Index: libc/elf/dl-open.c
  	    _dl_debug_printf ("\nadd %s [%lu] to global scope\n",
  			      map->l_name, map->l_ns);
  	}
-@@ -294,7 +294,7 @@
+@@ -293,7 +293,7 @@
    _dl_debug_state ();
  
    /* Print scope information.  */
@@ -26,7 +26,7 @@ Index: libc/elf/dl-open.c
      _dl_show_scope (new, 0);
  
    /* Only do lazy relocation if `LD_BIND_NOW' is not set.  */
-@@ -438,7 +438,7 @@
+@@ -501,7 +501,7 @@
  	}
  
        /* Print scope information.  */
@@ -37,9 +37,9 @@ Index: libc/elf/dl-open.c
  
 Index: libc/ports/sysdeps/mips/dl-lookup.c
 ===================================================================
---- libc.orig/ports/sysdeps/mips/dl-lookup.c	2012-03-09 08:54:34.707443996 -0800
-+++ libc/ports/sysdeps/mips/dl-lookup.c	2012-03-09 09:02:36.903467324 -0800
-@@ -111,7 +111,7 @@
+--- libc.orig/ports/sysdeps/mips/dl-lookup.c	2012-07-04 18:25:46.000000000 -0700
++++ libc/ports/sysdeps/mips/dl-lookup.c	2012-07-24 00:04:45.496274559 -0700
+@@ -110,7 +110,7 @@
  	continue;
  
        /* Print some debugging info if wanted.  */
@@ -48,7 +48,7 @@ Index: libc/ports/sysdeps/mips/dl-lookup.c
  	_dl_debug_printf ("symbol=%s;  lookup in file=%s [%lu]\n",
  			  undef_name,
  			  map->l_name[0] ? map->l_name : rtld_progname,
-@@ -432,7 +432,7 @@
+@@ -431,7 +431,7 @@
  		     hash table.  */
  		  if (__builtin_expect (tab->size, 0))
  		    {
@@ -57,7 +57,7 @@ Index: libc/ports/sysdeps/mips/dl-lookup.c
  		      __rtld_lock_unlock_recursive (tab->lock);
  		      goto success;
  		    }
-@@ -681,7 +681,7 @@
+@@ -680,7 +680,7 @@
  	}
  
        /* Display information if we are debugging.  */
@@ -66,6 +66,15 @@ Index: libc/ports/sysdeps/mips/dl-lookup.c
  	_dl_debug_printf ("\
  \nfile=%s [%lu];  needed by %s [%lu] (relocation dependency)\n\n",
  			  map->l_name[0] ? map->l_name : rtld_progname,
+@@ -787,7 +787,7 @@
+     {
+       if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK)
+ 	  && skip_map == NULL
+-	  && !(GLRO(dl_debug_mask) & DL_DEBUG_UNUSED))
++	  && !(GLRO_dl_debug_mask & DL_DEBUG_UNUSED))
+ 	{
+ 	  /* We could find no value for a strong reference.  */
+ 	  const char *reference_name = undef_map ? undef_map->l_name : "";
 @@ -860,7 +860,7 @@
    if (__builtin_expect (current_value.m->l_used == 0, 0))
      current_value.m->l_used = 1;
@@ -95,9 +104,9 @@ Index: libc/ports/sysdeps/mips/dl-lookup.c
        struct sym_val val = { NULL, NULL };
 Index: libc/elf/rtld.c
 ===================================================================
---- libc.orig/elf/rtld.c	2012-03-09 09:01:35.159464344 -0800
-+++ libc/elf/rtld.c	2012-03-09 09:01:56.247465364 -0800
-@@ -2198,7 +2198,7 @@
+--- libc.orig/elf/rtld.c	2012-07-04 18:26:34.000000000 -0700
++++ libc/elf/rtld.c	2012-07-23 22:55:10.700072511 -0700
+@@ -2214,7 +2214,7 @@
    GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
  
    /* Print scope information.  */
@@ -106,3 +115,16 @@ Index: libc/elf/rtld.c
      {
        _dl_debug_printf ("\nInitial object scopes\n");
  
+Index: libc/elf/dl-lookup.c
+===================================================================
+--- libc.orig/elf/dl-lookup.c	2012-07-04 18:26:35.000000000 -0700
++++ libc/elf/dl-lookup.c	2012-07-24 00:04:14.680273070 -0700
+@@ -770,7 +770,7 @@
+     {
+       if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK)
+ 	  && skip_map == NULL
+-	  && !(GLRO(dl_debug_mask) & DL_DEBUG_UNUSED))
++	  && !(GLRO_dl_debug_mask & DL_DEBUG_UNUSED))
+ 	{
+ 	  /* We could find no value for a strong reference.  */
+ 	  const char *reference_name = undef_map ? undef_map->l_name : "";
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/fileops-without-wchar-io.patch b/meta/recipes-core/eglibc/eglibc-2.16/fileops-without-wchar-io.patch
new file mode 100644
index 0000000..2ca0bca
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.16/fileops-without-wchar-io.patch
@@ -0,0 +1,22 @@
+Fix error like
+
+/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-eglibc/work/mips64-oe-linux/eglibc-2.16-r2+svnr19383/build-mips64-oe-linux/libc_pic.os: In function `_IO_new_file_fopen':
+/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-eglibc/work/mips64-oe-linux/eglibc-2.16-r2+svnr19383/eglibc-2_16/libc/libio/fileops.c:431: undefined reference to `_IO_file_close_it_internal'
+collect2: error: ld returned 1 exit status
+
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+Index: libc/libio/fileops.c
+===================================================================
+--- libc.orig/libio/fileops.c	2012-07-04 18:25:47.000000000 -0700
++++ libc/libio/fileops.c	2012-07-24 00:21:17.220322557 -0700
+@@ -428,7 +428,7 @@
+ 	  result->_mode = 1;
+ #else
+           /* Treat this as if we couldn't find the given character set.  */
+-          (void) INTUSE(_IO_file_close_it) (fp);
++          (void) _IO_file_close_it (fp);
+           __set_errno (EINVAL);
+           return NULL;
+ #endif
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index fc3d82b..8fa5451 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "19383"
 
 DEPENDS += "gperf-native"
-PR = "r2"
+PR = "r3"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_16"
@@ -23,6 +23,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=h
            file://ppc_slow_ieee754_sqrt.patch \
            file://rpc-bootstrap.patch \
            file://e500-math_private.patch \
+           file://fileops-without-wchar-io.patch \
           "
 LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
       file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
-- 
1.7.7.6

[CONSOLIDATED PULL 23/28] core-image: remove x11-netbook package group, it's unused

[Saul Wold]

From: Ross Burton <ross.burton@intel.com>

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/core-image.bbclass |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 6b207d7..13e45aa 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 # - x11-mini            - minimal environment for X11 server 
 # - x11-base            - X11 server + minimal desktop	
 # - x11-sato            - OpenedHand Sato environment
-# - x11-netbook         - Metacity based environment for netbooks
 # - apps-x11-core       - X Terminal, file manager, file editor
 # - apps-x11-games
 # - apps-x11-pimlico    - OpenedHand Pimlico apps
@@ -33,7 +32,6 @@ PACKAGE_GROUP_apps-console-core = "task-core-apps-console"
 PACKAGE_GROUP_x11-mini = "task-core-x11-mini"
 PACKAGE_GROUP_x11-base = "task-core-x11-base"
 PACKAGE_GROUP_x11-sato = "task-core-x11-sato"
-PACKAGE_GROUP_x11-netbook = "task-core-x11-netbook"
 PACKAGE_GROUP_apps-x11-core = "task-core-apps-x11-core"
 PACKAGE_GROUP_apps-x11-games = "task-core-apps-x11-games"
 PACKAGE_GROUP_apps-x11-pimlico = "task-core-apps-x11-pimlico"
-- 
1.7.7.6

[CONSOLIDATED PULL 24/28] busybox: fix the problem that mkfs.minix.tests fails on big endian platform

[Saul Wold]

From: Yao Zhao <yao.zhao@windriver.com>

patch mkfs.minix.tests to have correct md5sum on big endian platform.

Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../busybox-mkfs-minix-tests_bigendian.patch       |   34 ++++++++++++++++++++
 meta/recipes-core/busybox/busybox_1.19.4.bb        |    3 +-
 2 files changed, 36 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch

diff --git a/meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch b/meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch
new file mode 100644
index 0000000..089c5e0
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch
@@ -0,0 +1,34 @@
+patch mkfs.minix.tests to have correct md5sum on big endian platform
+
+Upstream-Status: Accepted, expected in next release
+
+Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
+
+diff --git a/testsuite/mkfs.minix.tests b/testsuite/mkfs.minix.tests
+index 8a33c16..7eecaf2 100755
+--- a/testsuite/mkfs.minix.tests
++++ b/testsuite/mkfs.minix.tests
+@@ -8,6 +8,14 @@
+ 
+ # testing "test name" "options" "expected result" "file input" "stdin"
+ 
++# '\n' produces 10 on little endian, but not on big endian
++cr=`echo | od -i | sed 's/.* //g;2d'`
++if [ x"$cr" = x"10" ]; then
++	hash=4f35f7afeba07d56055bed1f29ae20b7
++else
++	hash=5adbc1b3ccd20ca5d0ab5bc1e13ac3fc
++fi
++
+ testing "mkfs.minix" \
+ 	"dd if=/dev/zero of=input bs=1k count=1024 2>/dev/null; mkfs.minix input; md5sum <input" \
+ "352 inodes\n"\
+@@ -15,7 +23,7 @@ testing "mkfs.minix" \
+ "Firstdatazone=15 (15)\n"\
+ "Zonesize=1024\n"\
+ "Maxsize=268966912\n"\
+-"4f35f7afeba07d56055bed1f29ae20b7  -\n" \
++"$hash  -\n" \
+ 	"" \
+ 	""
+ 
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
index 6e69d22..cc97e2a 100644
--- a/meta/recipes-core/busybox/busybox_1.19.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -24,7 +24,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://mdev \
            file://mdev.conf \
            file://umount.busybox \
-           file://defconfig"
+           file://defconfig \
+           file://busybox-mkfs-minix-tests_bigendian.patch"
 
 SRC_URI[tarball.md5sum] = "9c0cae5a0379228e7b55e5b29528df8e"
 SRC_URI[tarball.sha256sum] = "9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee"
-- 
1.7.7.6

[CONSOLIDATED PULL 25/28] xinit_1.3.2: Remove broken, superfluous 'FILES_${PN} += "${libdir}X11/xinit"'

[Saul Wold]

From: "Robert P. J. Day" <rpjday@crashcourse.ca>

Besides being clearly broken, that line is unnecessary as that file is
already being picked up from this line in xorg-app-common.inc:

FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/"

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-graphics/xorg-app/xinit_1.3.2.bb |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/xorg-app/xinit_1.3.2.bb b/meta/recipes-graphics/xorg-app/xinit_1.3.2.bb
index 2008e79..5a97c3b 100644
--- a/meta/recipes-graphics/xorg-app/xinit_1.3.2.bb
+++ b/meta/recipes-graphics/xorg-app/xinit_1.3.2.bb
@@ -19,5 +19,3 @@ SRC_URI[sha256sum] = "a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e69
 EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie"
 
 RDEPENDS_${PN} += "util-linux-mcookie"
-
-FILES_${PN} += "${libdir}X11/xinit"
-- 
1.7.7.6

[CONSOLIDATED PULL 26/28] busybox:udhcpc: fix the root_is_nfs() function

[Saul Wold]

From: "Roy.Li" <rongqing.li@windriver.com>

[YOCTO #2788]

The system will be hung when udhcpc starts, if nfs is mounted
at "/" directory and default route is different after starting
udhcpc.

The cause is that root_is_nfs() does not work after kernel-2.6.37,
since the device name has been changed from /dev/root to
${IPADDR}:${NFSDIR} on /proc/mounts. which leads to remove
the default routes to nfs server,

Now we use a loose match to check if rootfs is nfs.

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/busybox/busybox_1.19.4.bb   |    2 +-
 meta/recipes-core/busybox/files/simple.script |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
index cc97e2a..7bdfbda 100644
--- a/meta/recipes-core/busybox/busybox_1.19.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://B921600.patch \
diff --git a/meta/recipes-core/busybox/files/simple.script b/meta/recipes-core/busybox/files/simple.script
index 27368f0..6973985 100644
--- a/meta/recipes-core/busybox/files/simple.script
+++ b/meta/recipes-core/busybox/files/simple.script
@@ -10,7 +10,8 @@ RESOLV_CONF="/etc/resolv.conf"
 
 # return 0 if root is mounted on a network filesystem
 root_is_nfs() {
-	grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts
+	sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\1 \2/p' /proc/mounts |
+	grep -q "^/ \(nfs\|smbfs\|ncp\|coda\)$"
 }
 
 have_bin_ip=0
-- 
1.7.7.6

[CONSOLIDATED PULL 27/28] package-index: inherit pythonnative

[Saul Wold]

From: Robert Yang <liezhi.yang@windriver.com>

The native python binary has been moved from usr/bin/python to
usr/bin/python-native/python, the recipe which needs python-native
should "inherit pythonnative", otherwise there would be errors when the
python script runs.

[YOCTO #2822]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/meta/package-index.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-core/meta/package-index.bb b/meta/recipes-core/meta/package-index.bb
index 96d54e3..3d7bb7e 100644
--- a/meta/recipes-core/meta/package-index.bb
+++ b/meta/recipes-core/meta/package-index.bb
@@ -1,6 +1,8 @@
 DESCRIPTION = "Rebuild the package index"
 LICENSE = "MIT"
 
+inherit pythonnative
+
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = "1"
 PACKAGES = ""
-- 
1.7.7.6

[CONSOLIDATED PULL 28/28] Add missing Upstream-Status to various patches.

[Saul Wold]

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

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 .../binutils/binutils/binutils-armv5e.patch        |    4 ++++
 .../ossp-uuid/0001-Change-library-name.patch       |    7 +++++++
 ...erve-m-option-status-in-v-option-handling.patch |    7 +++++++
 .../ossp-uuid/0003-Fix-whatis-entries.patch        |    7 +++++++
 .../ossp-uuid/0004-fix-data-uuid-from-string.patch |    7 +++++++
 .../ossp-uuid/ossp-uuid/uuid-libtool.patch         |    3 +++
 .../ossp-uuid/ossp-uuid/uuid-nostrip.patch         |    3 +++
 meta/recipes-devtools/rpm/rpm/rpm-lua.patch        |    2 ++
 meta/recipes-devtools/rpm/rpm/rpm-macros.patch     |    2 ++
 .../rpm/rpm/rpm-no-perl-urpm.patch                 |    2 ++
 meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch  |    2 ++
 .../rpm/rpm/rpm-packageorigin.patch                |    2 ++
 .../rpm/rpm/rpm-pkgconfigdeps.patch                |    2 ++
 meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch |    2 ++
 .../libzypp/libzypp/libzypp-rpm549.patch           |    4 ++++
 .../createrepo/createrepo/createrepo-rpm549.patch  |    3 +++
 16 files changed, 59 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch b/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch
index 4ac1a9c..c95eed6 100644
--- a/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch
+++ b/meta/recipes-devtools/binutils/binutils/binutils-armv5e.patch
@@ -5,6 +5,10 @@ the support "-march=" settings, but it was lacking the armv5e setting.  This
 was a simple way to add it, as thumb instructions shouldn't be generated by
 the compiler anyway.
 
+Upstream-Status: Denied
+Upstream maintainer indicated that we should not be using armv5e, even though
+it is a legal archicture defined by our gcc.
+
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
 diff -urN binutils-2.22.orig/gas/config/tc-arm.c binutils-2.22/gas/config/tc-arm.c
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
index a46e244..ed67c50 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
@@ -12,6 +12,13 @@ uuid library.
  uuid.pc.in       |    4 ++--
  5 files changed, 13 insertions(+), 13 deletions(-)
 
+----
+Upstream-Status: Inappropriate [not author]
+
+This patch is from debian ossp-uuid 1.6.2 integration.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
 diff --git a/Makefile.in b/Makefile.in
 index d28f4be..c2ba99d 100644
 --- a/Makefile.in
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
index 1467207..804a627 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
@@ -7,6 +7,13 @@ Bug: 531396
  uuid_cli.c |   19 ++++++++++---------
  1 files changed, 10 insertions(+), 9 deletions(-)
 
+----
+Upstream-Status: Inappropriate [not author]
+
+This patch is from debian ossp-uuid 1.6.2 integration.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
 diff --git a/uuid_cli.c b/uuid_cli.c
 index d1b0b11..14a67fe 100644
 --- a/uuid_cli.c
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
index 060a754..13cbb59 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
@@ -9,6 +9,13 @@ Fix whatis entry of uuid.1, uuid.3ossp and uuid++.3ossp manpages
  uuid_cli.pod |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
+----
+Upstream-Status: Inappropriate [not author]
+
+This patch is from debian ossp-uuid 1.6.2 integration.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
 diff --git a/uuid++.pod b/uuid++.pod
 index 8b5a4b1..89c5efb 100644
 --- a/uuid++.pod
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
index 1f92cea..bc5e111 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
@@ -4,6 +4,13 @@ Bug-Debian: http://bugs.debian.org/635607
 
 The module Data::GUID depends on Data::UUID supporting this behaviour.
 
+----
+Upstream-Status: Inappropriate [not author]
+
+This patch is from debian ossp-uuid 1.6.2 integration.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
 --- a/perl/uuid_compat.pm
 +++ b/perl/uuid_compat.pm
 @@ -93,7 +93,9 @@
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
index 97daca4..4bc91b8 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
@@ -1,5 +1,8 @@
 Remove hardcoded libtool name, fall back to generated name
 
+Upstream-Status: Inappropriate [no upstream]
+The project appears to no longer be accepting changes.
+
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
 diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
index 78f3c94..d806b5f 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
@@ -1,5 +1,8 @@
 We don't want anything stripped
 
+Upstream-Status: Inappropriate [no upstream]
+The project appears to no longer be accepting changes.
+
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
 diff -ur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lua.patch b/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
index 980e1b1..348a919 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
@@ -1,5 +1,7 @@
 Add support for cross compiling lua
 
+Upstream-Status: Pending
+
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
 diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch
index f25656a..c1516a4 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch
@@ -3,6 +3,8 @@ macros/macros.in: Revert settings to the same as RPM 5.4.0
 Enable a reasonable set of rpmdeps dependency helper macros.  These sets
 were used by RPM 5.4.0.
 
+Upstream-Status: Inappropriate [configuration]
+
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
 diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch
index 90fee35..442afbc 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-no-perl-urpm.patch
@@ -5,6 +5,8 @@ This causes a configure failure when perl-URPM is not used.
 | configure.ac:1159: required file `perl-URPM/Makefile.PL.in' not found
 | configure.ac:1159: required file `perl-URPM/Makefile.in' not found
 
+Upstream-Status: Inappropriate [disable feature]
+
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
 --- rpm-5.4.8/configure.ac.orig	2012-04-24 09:10:01.856749153 -0500
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch b/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
index 1f4ba98..db424b8 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch
@@ -4,6 +4,8 @@ We need to avoid including the util-linux uuid library, instead
 we need ossp-uuid.  There is a related hack in do_configure to
 make sure that we use the right .pc file as well.
 
+Upstream-Status: Inappropriate [disable feature]
+
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
 diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch b/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
index 3c6dad4..7e090a3 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch
@@ -2,6 +2,8 @@ Add the ability to query the packageorigin
 
 Written by jbj at rpm5.org
 
+Upstream-Status: Inappropriate [not author]
+
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
 Index: rpm-5.4.8/rpmdb/hdrfmt.c
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch
index 4aba400..f192545 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch
@@ -5,6 +5,8 @@ we don't want this as it may lead to inaccurate results in some corner cases.
 
 PKG_CONFIG_LIBDIR will ensure pkg-config stays within the install directory.
 
+Upstream-Status: Inappropriate [configuration]
+
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
 diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps.sh
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch b/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch
index 8c01a30..d272fe9 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch
@@ -3,6 +3,8 @@ lib/rpmts.c: Ensure that we check both providename and filepaths
 When looking up a missing dependencies, such as /bin/sh, we need to lookup
 in both the providename and filepaths DB, not just the filepaths DB.
 
+Upstream-Status: Pending
+
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
 --- rpm-5.4.0.orig/lib/rpmts.c	2010-12-27 16:08:25.000000000 -0600
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
index 8268a2d..7244284 100644
--- a/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
+++ b/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
@@ -6,6 +6,10 @@ Date:   Fri May 11 19:05:09 2012 -0500
     
     _RPMVSF_xxx - NODIGEST, NOSIGNATURES, NOHEADER, and NOPAYLOAD
     are now obsolete and no longer supported.
+
+    Upstream-Status: Inappropriate [other]
+      OE version is too old, when we uprev if this patch is still need it
+      should be sent upstream at that time.
     
     Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
diff --git a/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch b/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
index 3423c44..bc7200d 100644
--- a/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
+++ b/meta/recipes-support/createrepo/createrepo/createrepo-rpm549.patch
@@ -3,6 +3,9 @@ dumpMetadata.py: Fix for RPM5 - 5.4.9 integration
 RPM5 no longer has a switch to disable signature validation.  (Due to security
 validation concerns.)
 
+Upstream-Status: Inappropriate [other]
+  createrepo does not support RPM5 upstream
+
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
 diff -u createrepo-0.4.11.orig/dumpMetadata.py createrepo-0.4.11/dumpMetadata.py
-- 
1.7.7.6

Re: [CONSOLIDATED PULL 00/28] Fixes & eglibc 2.16

[Richard Purdie]

On Wed, 2012-07-25 at 00:18 -0700, Saul Wold wrote:
> Andrei Gherzan (1):
>   package.bbclass: Create symlinks for packages with different packaged
>     name
> 
> Bruce Ashfield (1):
>   linux-yocto/3.4: 3.4.6 and 3.4.x-rt14
> 
> Christopher Larson (2):
>   initscripts: don't bg mk_dirs in populate-volatile
>   libpcap: fix pcap-config to not return -Wl,-rpath
> 
> Denis Carikli (1):
>   kernel.bbclass: fix external module building
> 
> Khem Raj (6):
>   qemu.bbclass: Map the qemu binary name for powerpc64
>   cups_1.4.6.bb: Fix build on ppc64
>   libcgroup_0.37.1.bb: Add recipe
>   eglibc-initial: Fix build failure due to missing limits.h
>   gcc-cross-initial: Stage self sufficient fixed limits.h
>   eglibc: Fix build when OPTION_POSIX_WIDE_CHAR_DEVICE_IO is not set
> 
> Koen Kooi (1):
>   kernel bbclass: Recreate uImage only when KEEPUIMAGE != "yes"
> 
> Mark Hatle (1):
>   Add missing Upstream-Status to various patches.
> 
> Otavio Salvador (4):
>   bash: enable parallel build

I didn't take the above due to the build failures it seemed to cause.

>   bash: fix warning about bashbug reference /usr/bin when installed in
>     /bin
>   shadow-native: use 'users' group by default
>   shadow: use 'users' group by default
> 
> Paul Eggleton (2):
>   dhcp: remove dependency of dev/staticdev packages on main package
>   classes/package_deb: add PackageArch field
> 
> Robert P. J. Day (3):
>   libxp: Change superfluous "+=" to simple "=" when using _append
>   webkit-gtk: Replace superfluous "+=" with "=", and add leading space
>   xinit_1.3.2: Remove broken, superfluous 'FILES_${PN} +=
>     "${libdir}X11/xinit"'
> 
> Robert Yang (1):
>   package-index: inherit pythonnative

I didn't take the above since I have some unanswered questions about
this one.

> Ross Burton (1):
>   core-image: remove x11-netbook package group, it's unused
> 
> Roy.Li (1):
>   busybox:udhcpc: fix the root_is_nfs() function
> 
> Saul Wold (1):
>   tcmode-default: Bump EGLIBC Version to 2.16

I didn't take the above yet as again I think there are some remaining
issues I want to ensure we merge the right pieces for.

> Wenzong Fan (1):
>   remake: Add remake-native and remake
> 
> Yao Zhao (1):
>   busybox: fix the problem that mkfs.minix.tests fails on big endian
>     platform

I merged the others.

Cheers,

Richard