[CONSOLIDATED PULL 00/20] July 21, 2011

[CONSOLIDATED PULL 00/20] July 21, 2011

[Saul Wold]

Richard,

Review and tested, the inherit perlnatives are needed.


Sau!

The following changes since commit 0d03800caffc2341b74190d38f7a372223c89f4c:

  lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib (2011-07-20 15:43:43 +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

Martin Jansa (9):
  tcmode-default: set preferred version also for (e)glibc-locale
  eglibc-package: don't fail without localedef/gconv
  python: save Makefile.sysroot in do_compile
  python: add patch to fix cross compilation on host with linux-3.0
  polkit: inherit perlnative
  shared-mime-info: inherit perlnative
  xkeyboard-config: inherit perlnative
  avahi: inherit perlnative
  vte: inherit perlnative

Matthew McClintock (2):
  Add endianess macros used by previous endian-ness_handling.patch
  Make intltool use perlnative instead of perl on host

Saul Wold (2):
  clutter-box2d: fix isfinite.patch
  gettext: Add depends to gettext to avoid host contamination

Tom Rini (7):
  python-native: Mangle scripts to use /usr/bin/env python, bump PR
  gnome-doc-utils: Use /usr/bin/env python in xml2po, bump PR
  perl-native: Add a perl-native wrapper in the normal bindir
  cpan.bbclass: Perform more mangling for perl path
  icon-naming-utils-native: Fix long path to perl in icon-name-mapping
  siteinfo.bbclass: Port over oe.dev logic for site files
  local.conf.sample: Add a note about ASSUME_PROVIDED for help2man

 meta/classes/cpan.bbclass                          |    3 +
 meta/classes/siteinfo.bbclass                      |  203 ++++++++++----------
 meta/conf/distro/include/tcmode-default.inc        |    2 +
 meta/conf/local.conf.sample                        |    3 +
 meta/recipes-connectivity/avahi/avahi.inc          |    2 +-
 meta/recipes-core/eglibc/eglibc-package.inc        |    8 +-
 .../ldconfig-native-2.12.1/endianess-header.patch  |  113 +++++++++++
 meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb |    5 +-
 meta/recipes-core/gettext/gettext_0.18.1.1.bb      |    6 +-
 .../icon-naming-utils-native_0.8.7.bb              |    7 +-
 meta/recipes-devtools/intltool/intltool.inc        |    2 +-
 meta/recipes-devtools/intltool/intltool_0.40.6.bb  |    2 +-
 meta/recipes-devtools/perl/liburi-perl_1.58.bb     |    2 +-
 .../perl/libxml-parser-perl_2.40.bb                |    2 +-
 meta/recipes-devtools/perl/libxml-perl_0.08.bb     |    2 +-
 .../perl/libxml-simple-perl_2.18.bb                |    2 +-
 meta/recipes-devtools/perl/perl-native_5.12.3.bb   |   17 ++-
 .../recipes-devtools/python/python-native_2.6.6.bb |    5 +
 .../python/python/07-linux3-regen-fix.patch        |   18 ++
 meta/recipes-devtools/python/python_2.6.6.bb       |    8 +-
 .../sgmlspl/sgmlspl-native_1.03ii.bb               |    2 +-
 .../perl/libconvert-asn1-perl_0.22.bb              |    2 +-
 .../recipes-extended/perl/libtimedate-perl_1.20.bb |    2 +-
 .../perl/libxml-namespacesupport-perl_1.11.bb      |    2 +-
 meta/recipes-extended/perl/libxml-sax-perl_0.96.bb |    2 +-
 meta/recipes-extended/polkit/polkit_0.101.bb       |    2 +-
 .../use-usr-bin-env-for-python-in-xml2po.patch     |   33 ++++
 meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |    5 +-
 .../clutter/clutter-box2d/isfinite.patch           |   18 +-
 .../xorg-lib/xkeyboard-config_2.1.bb               |    2 +-
 .../shared-mime-info/shared-mime-info.inc          |    2 +-
 meta/recipes-support/vte/vte.inc                   |    2 +-
 32 files changed, 342 insertions(+), 144 deletions(-)
 create mode 100644 meta/recipes-core/eglibc/ldconfig-native-2.12.1/endianess-header.patch
 create mode 100644 meta/recipes-devtools/python/python/07-linux3-regen-fix.patch
 create mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
 create mode 100644 meta/site/common-linux

-- 
1.7.3.4

[CONSOLIDATED PULL 01/20] Add endianess macros used by previous endian-ness_handling.patch

[Saul Wold]

From: Matthew McClintock <msm@freescale.com>

Some distro's don't include these macros in /usr/include/endian.h
so we include them via this patch

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 .../ldconfig-native-2.12.1/endianess-header.patch  |  113 ++++++++++++++++++++
 meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb |    5 +-
 2 files changed, 116 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-core/eglibc/ldconfig-native-2.12.1/endianess-header.patch

diff --git a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/endianess-header.patch b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/endianess-header.patch
new file mode 100644
index 0000000..a18b2c2
--- /dev/null
+++ b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/endianess-header.patch
@@ -0,0 +1,113 @@
+Upstream-Status: Inappropriate [fix poky patch]
+
+This patch fixes build issues with a previous endian-ness_handling.patch on
+distros that don't have macros referenced
+
+7/20/2011
+Matthew McClintock <msm@freescale.com>
+
+diff -purN ldconfig-native-2.12.1.orig/endian_extra.h ldconfig-native-2.12.1/endian_extra.h
+--- ldconfig-native-2.12.1.orig/endian_extra.h	1969-12-31 18:00:00.000000000 -0600
++++ ldconfig-native-2.12.1/endian_extra.h	2011-07-19 18:09:14.323048417 -0500
+@@ -0,0 +1,64 @@
++/* Copyright (C) 1992, 1996, 1997, 2000, 2008 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <endian.h>
++
++#ifndef	_ENDIAN_EXTRA_H
++#define	_ENDIAN_EXTRA_H	1
++
++/* Don't redefine these macros if they already exist */
++#ifndef htobe16
++#ifdef __USE_BSD
++/* Conversion interfaces.  */
++# include <byteswap.h>
++
++# if __BYTE_ORDER == __LITTLE_ENDIAN
++#  define htobe16(x) __bswap_16 (x)
++#  define htole16(x) (x)
++#  define be16toh(x) __bswap_16 (x)
++#  define le16toh(x) (x)
++
++#  define htobe32(x) __bswap_32 (x)
++#  define htole32(x) (x)
++#  define be32toh(x) __bswap_32 (x)
++#  define le32toh(x) (x)
++
++#  define htobe64(x) __bswap_64 (x)
++#  define htole64(x) (x)
++#  define be64toh(x) __bswap_64 (x)
++#  define le64toh(x) (x)
++# else
++#  define htobe16(x) (x)
++#  define htole16(x) __bswap_16 (x)
++#  define be16toh(x) (x)
++#  define le16toh(x) __bswap_16 (x)
++
++#  define htobe32(x) (x)
++#  define htole32(x) __bswap_32 (x)
++#  define be32toh(x) (x)
++#  define le32toh(x) __bswap_32 (x)
++
++#  define htobe64(x) (x)
++#  define htole64(x) __bswap_64 (x)
++#  define be64toh(x) (x)
++#  define le64toh(x) __bswap_64 (x)
++# endif
++#endif
++#endif
++
++#endif	/* endian_extra.h */
+diff -purN ldconfig-native-2.12.1.orig/cache.c ldconfig-native-2.12.1/cache.c
+--- ldconfig-native-2.12.1.orig/cache.c	2011-07-19 18:21:28.347041301 -0500
++++ ldconfig-native-2.12.1/cache.c	2011-07-19 18:22:54.118048064 -0500
+@@ -39,6 +39,8 @@
+ # define N_(msgid)  msgid
+ #define _(msg) msg
+ 
++#include "endian_extra.h"
++
+ extern int be;
+ 
+ static uint16_t write16(uint16_t x, int be)
+diff -purN ldconfig-native-2.12.1.orig/readelflib.c ldconfig-native-2.12.1/readelflib.c
+--- ldconfig-native-2.12.1.orig/readelflib.c	2011-07-19 18:21:28.346041593 -0500
++++ ldconfig-native-2.12.1/readelflib.c	2011-07-19 18:23:05.324059875 -0500
+@@ -25,6 +25,9 @@
+ 
+ /* check_ptr checks that a pointer is in the mmaped file and doesn't
+    point outside it.  */
++
++#include "endian_extra.h"
++
+ #undef check_ptr
+ #define check_ptr(ptr)						\
+ do								\
+diff -purN ldconfig-native-2.12.1.orig/readlib.c ldconfig-native-2.12.1/readlib.c
+--- ldconfig-native-2.12.1.orig/readlib.c	2011-07-19 18:21:28.346041593 -0500
++++ ldconfig-native-2.12.1/readlib.c	2011-07-19 18:23:23.877046210 -0500
+@@ -40,6 +40,8 @@
+ 
+ #include "ldconfig.h"
+ 
++#include "endian_extra.h"
++
+ #define _(msg) msg
+ 
+ #define Elf32_CLASS ELFCLASS32
diff --git a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
index bacf9f8..00edb6e 100644
--- a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
+++ b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
@@ -9,9 +9,10 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
            file://ldconfig_aux-cache_path_fix.patch \
            file://32and64bit.patch \
            file://endian-ness_handling.patch \
-           file://flag_fix.patch "
+           file://flag_fix.patch \
+           file://endianess-header.patch"
 
-PR = "r0"
+PR = "r1"
 
 inherit native
 
-- 
1.7.3.4

[CONSOLIDATED PULL 02/20] python-native: Mangle scripts to use /usr/bin/env python, bump PR

[Saul Wold]

From: Tom Rini <tom_rini@mentor.com>

This is dd33ced4b8123600efa1f67f704aec13b0842ad1 in oe.dev and needed
for building in deep paths.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 .../recipes-devtools/python/python-native_2.6.6.bb |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-devtools/python/python-native_2.6.6.bb b/meta/recipes-devtools/python/python-native_2.6.6.bb
index fa943f4..59ed61a 100644
--- a/meta/recipes-devtools/python/python-native_2.6.6.bb
+++ b/meta/recipes-devtools/python/python-native_2.6.6.bb
@@ -36,4 +36,9 @@ do_install() {
 	oe_runmake 'DESTDIR=${D}' install
 	install -d ${D}${bindir}/
 	install -m 0755 Parser/pgen ${D}${bindir}/
+
+	# Make sure we use /usr/bin/env python
+	for PYTHSCRIPT in `grep -rIl ${bindir}/python ${D}${bindir}`; do
+		sed -i -e '1s|^#!.*|#!/usr/bin/env python|' $PYTHSCRIPT
+	done
 }
-- 
1.7.3.4

[CONSOLIDATED PULL 03/20] gnome-doc-utils: Use /usr/bin/env python in xml2po, bump PR

[Saul Wold]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=a, Size: 3229 bytes --]

From: Tom Rini <tom_rini@mentor.com>

In oe.dev we can just sed over the binary but in newer versions of this
program we need to fix the in use copy too.  As noted in the patch header,
this isn't appropriate for upstream as it could change behavior on Windows.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 .../use-usr-bin-env-for-python-in-xml2po.patch     |   33 ++++++++++++++++++++
 meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |    5 ++-
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch

diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
new file mode 100644
index 0000000..a285ad2
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
@@ -0,0 +1,33 @@
+Upstream-Status="Inappropriate [Would break behavior on Windows]"
+
+We can't use #!/full/path/to/python -u as this can be longer than shebang
+allows for.  In order to be appropraite for upstream more work would be
+needed to make sure that the main xml2po code doesn't rely on python
+being invoked with -u (force stdin/out/err to be used raw).
+---
+ xml2po/xml2po/Makefile.am  |    1 -
+ xml2po/xml2po/xml2po.py.in |    2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+Index: gnome-doc-utils-0.20.6/xml2po/xml2po/Makefile.am
+===================================================================
+--- gnome-doc-utils-0.20.6.orig/xml2po/xml2po/Makefile.am
++++ gnome-doc-utils-0.20.6/xml2po/xml2po/Makefile.am
+@@ -7,7 +7,6 @@ CLEANFILES = xml2po
+ 
+ xml2po: xml2po.py.in
+ 	sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \
+-	    -e "s+^#!.*python.*+#!$(PYTHON)+" \
+ 	  < $(srcdir)/xml2po.py.in > xml2po
+ 	chmod +x xml2po
+ 
+Index: gnome-doc-utils-0.20.6/xml2po/xml2po/xml2po.py.in
+===================================================================
+--- gnome-doc-utils-0.20.6.orig/xml2po/xml2po/xml2po.py.in
++++ gnome-doc-utils-0.20.6/xml2po/xml2po/xml2po.py.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python -u
++#!/usr/bin/env python
+ # -*- encoding: utf-8 -*-
+ # Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo@gnome.org>.
+ # Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>.
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
index 4554122..1ec1076 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
@@ -1,9 +1,10 @@
 require gnome-doc-utils.inc
 LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
 		    file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
-PR = "r3"
+PR = "r4"
 
-SRC_URI += "file://xsltproc_nonet.patch"
+SRC_URI += "file://xsltproc_nonet.patch \
+	    file://use-usr-bin-env-for-python-in-xml2po.patch"
 
 SRC_URI[archive.md5sum] = "8f6e05071599bc073007830ea0a68391"
 SRC_URI[archive.sha256sum] = "091486e370480bf45349ad09dac799211092a02938b26a0d68206172cb6cebbf"
-- 
1.7.3.4

[CONSOLIDATED PULL 04/20] perl-native: Add a perl-native wrapper in the normal bindir

[Saul Wold]

From: Tom Rini <tom_rini@mentor.com>

We need this to allow for scripts to do #!/usr/bin/env perl-native
and not require an 'inherit perlnative' per user of a package.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 meta/recipes-devtools/perl/perl-native_5.12.3.bb |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/perl/perl-native_5.12.3.bb b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
index 63f7e13..945ebd4 100644
--- a/meta/recipes-devtools/perl/perl-native_5.12.3.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
 		    file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
-PR = "r3"
+PR = "r4"
 
 LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
                     file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
@@ -102,3 +102,18 @@ do_install () {
 	create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
 	create_wrapper ${D}${bindir}/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
 }
+
+SYSROOT_PREPROCESS_FUNCS += "perl_sysroot_create_wrapper"
+
+perl_sysroot_create_wrapper () {
+	mkdir -p ${SYSROOT_DESTDIR}${bindir}
+	# Create a wrapper that /usr/bin/env perl will use to get perl-native.
+	# This MUST live in the normal bindir.
+	cat > ${SYSROOT_DESTDIR}${bindir}/../nativeperl << EOF
+#!/bin/sh
+realpath=\`readlink -fn \$0\`
+exec \`dirname \$realpath\`/perl-native/perl "\$@"
+EOF
+	chmod 0755 ${SYSROOT_DESTDIR}${bindir}/../nativeperl
+	cat ${SYSROOT_DESTDIR}${bindir}/../nativeperl
+}
-- 
1.7.3.4

[CONSOLIDATED PULL 05/20] cpan.bbclass: Perform more mangling for perl path

[Saul Wold]

From: Tom Rini <tom_rini@mentor.com>

On hosts where we may already be past the #! limit this is required
and this is safe on the target as well.  This is be7fe31 in oe.dev.
Related to this we now bump all PRs for recipes that inherit cpan.
Note that in oe.dev we mangle for perl but here we use the new
nativeperl script.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 meta/classes/cpan.bbclass                          |    3 +++
 meta/recipes-devtools/perl/liburi-perl_1.58.bb     |    2 +-
 .../perl/libxml-parser-perl_2.40.bb                |    2 +-
 meta/recipes-devtools/perl/libxml-perl_0.08.bb     |    2 +-
 .../perl/libxml-simple-perl_2.18.bb                |    2 +-
 .../sgmlspl/sgmlspl-native_1.03ii.bb               |    2 +-
 .../perl/libconvert-asn1-perl_0.22.bb              |    2 +-
 .../recipes-extended/perl/libtimedate-perl_1.20.bb |    2 +-
 .../perl/libxml-namespacesupport-perl_1.11.bb      |    2 +-
 meta/recipes-extended/perl/libxml-sax-perl_0.96.bb |    2 +-
 10 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index cbf428d..cb1c2f4 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -35,6 +35,9 @@ cpan_do_compile () {
 
 cpan_do_install () {
 	oe_runmake DESTDIR="${D}" install_vendor
+	for PERLSCRIPT in `grep -rIEl '#!${bindir}/perl-native.*/perl' ${D}`; do
+		sed -i -e 's|^#!${bindir}/perl-native.*/perl|#!/usr/bin/env nativeperl|' $PERLSCRIPT
+	done
 }
 
 EXPORT_FUNCTIONS do_configure do_compile do_install
diff --git a/meta/recipes-devtools/perl/liburi-perl_1.58.bb b/meta/recipes-devtools/perl/liburi-perl_1.58.bb
index 76a1231..ebb4911 100644
--- a/meta/recipes-devtools/perl/liburi-perl_1.58.bb
+++ b/meta/recipes-devtools/perl/liburi-perl_1.58.bb
@@ -4,7 +4,7 @@ and manipulate the various components that make up these strings."
 
 SECTION = "libs"
 LICENSE = "Artistic | GPLv1+"
-PR = "r0"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://README;beginline=26;endline=30;md5=6c33ae5c87fd1c4897714e122dd9c23d"
 
diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb
index 3f1a0ad..1d1593b 100644
--- a/meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb
+++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e
 
 DEPENDS += "expat expat-native"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
 SRC_URI[md5sum] = "c66e9adba003d0667cc40115ccd837a5"
diff --git a/meta/recipes-devtools/perl/libxml-perl_0.08.bb b/meta/recipes-devtools/perl/libxml-perl_0.08.bb
index 9c74cdb..fb637a8 100644
--- a/meta/recipes-devtools/perl/libxml-perl_0.08.bb
+++ b/meta/recipes-devtools/perl/libxml-perl_0.08.bb
@@ -5,7 +5,7 @@ XML::Grove and others."
 SUMMARY = "Collection of Perl modules for working with XML."
 SECTION = "libs"
 LICENSE = "Artistic | GPLv1+"
-PR = "r0"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://README;beginline=33;endline=35;md5=1705549eef7577a3d6ba71123a1f0ce8"
 
diff --git a/meta/recipes-devtools/perl/libxml-simple-perl_2.18.bb b/meta/recipes-devtools/perl/libxml-simple-perl_2.18.bb
index 89b65b2..3a50d7f 100644
--- a/meta/recipes-devtools/perl/libxml-simple-perl_2.18.bb
+++ b/meta/recipes-devtools/perl/libxml-simple-perl_2.18.bb
@@ -2,7 +2,7 @@ SECTION = "libs"
 LICENSE = "Artistic"
 LIC_FILES_CHKSUM = "file://README;beginline=70;md5=94aa5d46682b411a53a5494cfb22640e"
 DEPENDS += "libxml-parser-perl"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Simple-${PV}.tar.gz"
 
diff --git a/meta/recipes-devtools/sgmlspl/sgmlspl-native_1.03ii.bb b/meta/recipes-devtools/sgmlspl/sgmlspl-native_1.03ii.bb
index 4e01f17..28e0e9f 100644
--- a/meta/recipes-devtools/sgmlspl/sgmlspl-native_1.03ii.bb
+++ b/meta/recipes-devtools/sgmlspl/sgmlspl-native_1.03ii.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://search.cpan.org/src/DMEGG/SGMLSpm-1.03ii/DOC/HTML/SGMLSpm/sgm
 SECTION = "libs"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.cpan.org/authors/id/D/DM/DMEGG/SGMLSpm-${PV}.tar.gz \
            file://combined.patch"
diff --git a/meta/recipes-extended/perl/libconvert-asn1-perl_0.22.bb b/meta/recipes-extended/perl/libconvert-asn1-perl_0.22.bb
index fc77b75..48e107c 100644
--- a/meta/recipes-extended/perl/libconvert-asn1-perl_0.22.bb
+++ b/meta/recipes-extended/perl/libconvert-asn1-perl_0.22.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Convert::ASN1 - ASN.1 Encode/Decode library"
 SECTION = "libs"
 LICENSE = "Artistic|GPLv1+"
 LIC_FILES_CHKSUM = "file://README;beginline=10;endline=12;md5=a64b291b13ffddeef33b14f047ee8b26"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/Convert-ASN1-${PV}.tar.gz"
 
diff --git a/meta/recipes-extended/perl/libtimedate-perl_1.20.bb b/meta/recipes-extended/perl/libtimedate-perl_1.20.bb
index 7298f37..c925980 100644
--- a/meta/recipes-extended/perl/libtimedate-perl_1.20.bb
+++ b/meta/recipes-extended/perl/libtimedate-perl_1.20.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 # You can redistribute it and/or modify it under the same terms as Perl itself.
 LICENSE = "Artistic|GPLv1+"
 LIC_FILES_CHKSUM = "file://README;beginline=21;md5=576b7cb41e5e821501a01ed66f0f9d9e"
-PR = "r2"
+PR = "r3"
 
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/TimeDate-${PV}.tar.gz"
diff --git a/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.11.bb b/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.11.bb
index d96430e..f306ff1 100644
--- a/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.11.bb
+++ b/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.11.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "XML::NamespaceSupport offers a simple way to process namespace-ba
 
 SECTION = "libs"
 LICENSE = "Artistic|GPLv1+"
-PR = "r0"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://META.yml;beginline=22;endline=22;md5=3b2b564dae8b9af9e8896e85c07dcbe5"
 
diff --git a/meta/recipes-extended/perl/libxml-sax-perl_0.96.bb b/meta/recipes-extended/perl/libxml-sax-perl_0.96.bb
index 13956cb..97d2025 100644
--- a/meta/recipes-extended/perl/libxml-sax-perl_0.96.bb
+++ b/meta/recipes-extended/perl/libxml-sax-perl_0.96.bb
@@ -11,7 +11,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPLv1+"
 DEPENDS += "libxml-namespacesupport-perl-native"
 RDEPENDS_${PN} += "libxml-namespacesupport-perl perl-module-file-temp"
-PR = "r0"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=65c4cd8f39c24c7135ed70dacbcb09e3"
 
-- 
1.7.3.4

[CONSOLIDATED PULL 06/20] icon-naming-utils-native: Fix long path to perl in icon-name-mapping

[Saul Wold]

From: Tom Rini <tom_rini@mentor.com>

This is 5396e0868cf89787746fa6341ddb1f271a770595 in oe.dev but here we
instead use the nativeperl wrapper.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 .../icon-naming-utils-native_0.8.7.bb              |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/icon-naming-utils/icon-naming-utils-native_0.8.7.bb b/meta/recipes-devtools/icon-naming-utils/icon-naming-utils-native_0.8.7.bb
index d34fb03..4760c96 100644
--- a/meta/recipes-devtools/icon-naming-utils/icon-naming-utils-native_0.8.7.bb
+++ b/meta/recipes-devtools/icon-naming-utils/icon-naming-utils-native_0.8.7.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPLv2"
 DEPENDS = "libxml-simple-perl-native"
-PR = "r2"
+PR = "r3"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
@@ -9,3 +9,8 @@ SRC_URI = "http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz"
 S = "${WORKDIR}/icon-naming-utils-${PV}"
 
 inherit autotools native perlnative
+
+do_configure_append() {
+	# Make sure we use our nativeperl wrapper.
+	sed -i -e "1s:#!.*:#!/usr/bin/env nativeperl:" ${S}/icon-name-mapping.pl.in
+}
-- 
1.7.3.4

[CONSOLIDATED PULL 07/20] siteinfo.bbclass: Port over oe.dev logic for site files

[Saul Wold]

From: Tom Rini <tom_rini@mentor.com>

In oe.dev we have a sets to pick out hostos/hostarch/etc site
files out of and include things like a common-linux site file.
This should also help out with adding multilib-specific site files
(ie x32).  In oe.dev we have an iterator but at Richard's request
we continue to return a list of files in siteinfo_get_files().

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 meta/classes/siteinfo.bbclass |  203 ++++++++++++++++++++---------------------
 1 files changed, 98 insertions(+), 105 deletions(-)
 create mode 100644 meta/site/common-linux

diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 78b7008..ff9fd0d 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -15,121 +15,114 @@
 # It is an error for the target not to exist.
 # If 'what' doesn't exist then an empty value is returned
 #
-def get_siteinfo_list(d):
-       target = bb.data.getVar('HOST_ARCH', d, 1) + "-" + bb.data.getVar('HOST_OS', d, 1)
+def siteinfo_data(d):
+    archinfo = {
+        "allarch": "endian-little bit-32", # bogus, but better than special-casing the checks below for allarch
+        "arm": "endian-little bit-32 arm-common",
+        "armeb": "endian-big bit-32 arm-common",
+        "avr32": "endian-big bit-32 avr32-common",
+        "bfin": "endian-little bit-32 bfin-common",
+        "i386": "endian-little bit-32 ix86-common",
+        "i486": "endian-little bit-32 ix86-common",
+        "i586": "endian-little bit-32 ix86-common",
+        "i686": "endian-little bit-32 ix86-common",
+        "ia64": "endian-little bit-64",
+        "microblaze": "endian-big bit-32 microblaze-common",
+        "microblazeel": "endian-little bit-32 microblaze-common",
+        "mips": "endian-big bit-32 mips-common",
+        "mips64": "endian-big bit-64 mips64-common",
+        "mips64el": "endian-little bit-64 mips64-common",
+        "mipsel": "endian-little bit-32 mips-common",
+        "powerpc": "endian-big bit-32 powerpc-common",
+        "nios2": "endian-little bit-32 nios2-common",
+        "powerpc64": "endian-big bit-64 powerpc-common powerpc64-linux",
+        "ppc": "endian-big bit-32 powerpc-common",
+        "ppc64": "endian-big bit-64 powerpc-common powerpc64-linux",
+        "sh3": "endian-little bit-32 sh-common",
+        "sh4": "endian-little bit-32 sh-common",
+        "sparc": "endian-big bit-32",
+        "viac3": "endian-little bit-32 ix86-common",
+        "x86_64": "endian-little bit-64",
+    }
+    osinfo = {
+        "darwin": "common-darwin",
+        "darwin9": "common-darwin",
+        "linux": "common-linux common-glibc",
+        "linux-gnueabi": "common-linux common-glibc",
+        "linux-gnuspe": "common-linux common-glibc",
+        "linux-uclibc": "common-linux common-uclibc",
+        "linux-uclibceabi": "common-linux common-uclibc",
+        "linux-uclibcspe": "common-linux common-uclibc",
+        "uclinux-uclibc": "common-uclibc",
+        "cygwin": "common-cygwin",
+        "mingw32": "common-mingw",
+    }
+    targetinfo = {
+        "arm-linux-gnueabi": "arm-linux",
+        "arm-linux-uclibceabi": "arm-linux-uclibc",
+        "armeb-linux-gnueabi": "armeb-linux",
+        "armeb-linux-uclibceabi": "armeb-linux-uclibc",
+        "powerpc-linux-gnuspe": "powerpc-linux",
+        "powerpc-linux-uclibcspe": "powerpc-linux-uclibc",
+    }
 
-       targetinfo = {\
-               "allarch-linux":           "",\
-               "armeb-linux":             "endian-big bit-32 common-glibc arm-common",\
-               "armeb-linux-gnueabi":     "endian-big bit-32 common-glibc arm-common armeb-linux",\
-               "armeb-linux-uclibc":      "endian-big bit-32 common-uclibc arm-common",\
-               "armeb-linux-uclibceabi": "endian-big bit-32 common-uclibc arm-common armeb-linux-uclibc",\
-               "arm-darwin":              "endian-little bit-32 common-darwin",\
-               "arm-darwin8":              "endian-little bit-32 common-darwin",\
-               "arm-linux":               "endian-little bit-32 common-glibc arm-common",\
-               "arm-linux-gnueabi":       "endian-little bit-32 common-glibc arm-common arm-linux",\
-               "arm-linux-uclibc":        "endian-little bit-32 common-uclibc arm-common",\
-               "arm-linux-uclibceabi": "endian-little bit-32 common-uclibc arm-common arm-linux-uclibc",\
-               "avr32-linux":             "endian-big bit-32 common-glibc avr32-common",\ 
-               "avr32-linux-uclibc":      "endian-big bit-32 common-uclibc avr32-common",\
-               "bfin-uclinux-uclibc":       "endian-little bit-32 common-uclibc bfin-common",\
-               "i386-linux":              "endian-little bit-32 common-glibc ix86-common",\
-               "i486-linux":              "endian-little bit-32 common-glibc ix86-common",\
-               "i586-linux":              "endian-little bit-32 common-glibc ix86-common",\
-               "i686-linux":              "endian-little bit-32 common-glibc ix86-common",\
-               "i386-linux-uclibc":       "endian-little bit-32 common-uclibc ix86-common",\
-               "i486-linux-uclibc":       "endian-little bit-32 common-uclibc ix86-common",\
-               "i586-linux-uclibc":       "endian-little bit-32 common-uclibc ix86-common",\
-               "i686-linux-uclibc":       "endian-little bit-32 common-uclibc ix86-common",\
-               "microblaze-linux-gnu":    "endian-big bit-32 common-glibc microblaze-common",\
-               "microblazeel-linux-gnu":  "endian-little bit-32 common-glibc microblaze-common",\
-               "mipsel-linux":            "endian-little bit-32 common-glibc mips-common",\
-               "mipsel-linux-uclibc":     "endian-little bit-32 common-uclibc mips-common",\
-               "mips-linux":              "endian-big bit-32 common-glibc mips-common",\
-               "mips-linux-uclibc":       "endian-big bit-32 common-uclibc mips-common",\
-               "powerpc-darwin":          "endian-big bit-32 common-darwin",\
-               "ppc-linux":               "endian-big bit-32 common-glibc powerpc-common",\ 
-	       "powerpc-linux":           "endian-big bit-32 common-glibc powerpc-common",\
-               "powerpc-linux-gnuspe":    "endian-big bit-32 common-glibc powerpc-common",\
-               "powerpc-linux-uclibc":    "endian-big bit-32 common-uclibc powerpc-common",\
-               "sh3-linux":               "endian-little bit-32 common-glibc sh-common",\
-               "sh4-linux":               "endian-little bit-32 common-glibc sh-common",\
-               "sh4-linux-uclibc":        "endian-little bit-32 common-uclibc sh-common",\
-               "sparc-linux":             "endian-big bit-32 common-glibc",\
-               "x86_64-linux":            "endian-little bit-64 common-glibc",\
-               "x86_64-linux-uclibc":     "endian-little bit-64 common-uclibc"}
-       if target in targetinfo:
-               info = targetinfo[target].split()
-               info.append(target)
-               info.append("common")
-               return info
-       else:
-               bb.error("Information not available for target '%s'" % target)
+    hostarch = d.getVar("HOST_ARCH", True)
+    hostos = d.getVar("HOST_OS", True)
+    target = "%s-%s" % (hostarch, hostos)
 
+    sitedata = []
+    if hostarch in archinfo:
+        sitedata.extend(archinfo[hostarch].split())
+    if hostos in osinfo:
+        sitedata.extend(osinfo[hostos].split())
+    if target in targetinfo:
+        sitedata.extend(targetinfo[target].split())
+    sitedata.append(target)
+    sitedata.append("common")
 
-#
-# Define which site files to use. We check for several site files and
-# use each one that is found, based on the list returned by get_siteinfo_list()
-#
-# Search for the files in the following directories:
-# 1) ${BBPATH}/site (in reverse) - app specific, then site wide
-# 2) ${FILE_DIRNAME}/site-${PV}         - app version specific
-#
-def siteinfo_get_files(d):
-       sitefiles = ""
+    bb.debug(1, "SITE files %s" % sitedata);
+    return sitedata
 
-       # Determine which site files to look for
-       sites = get_siteinfo_list(d)
+python () {
+    sitedata = set(siteinfo_data(d))
+    if "endian-little" in sitedata:
+        d.setVar("SITEINFO_ENDIANESS", "le")
+    elif "endian-big" in sitedata:
+        d.setVar("SITEINFO_ENDIANESS", "be")
+    else:
+        bb.error("Unable to determine endianness for architecture '%s'" %
+                 d.getVar("HOST_ARCH", True))
+        bb.fatal("Please add your architecture to siteinfo.bbclass")
 
-       # Check along bbpath for site files and append in reverse order so
-       # the application specific sites files are last and system site
-       # files first.
-       path_bb = bb.data.getVar('BBPATH', d, 1)
-       for p in (path_bb or "").split(':'):
-               tmp = ""
-               for i in sites:
-                       fname = os.path.join(p, 'site', i)
-                       if os.path.exists(fname):
-                               tmp += fname + " "
-               sitefiles = tmp + sitefiles;
+    if "bit-32" in sitedata:
+        d.setVar("SITEINFO_BITS", "32")
+    elif "bit-64" in sitedata:
+        d.setVar("SITEINFO_BITS", "64")
+    else:
+        bb.error("Unable to determine bit size for architecture '%s'" %
+                 d.getVar("HOST_ARCH", True))
+        bb.fatal("Please add your architecture to siteinfo.bbclass")
+}
 
-       # Now check for the applications version specific site files
-       path_pkgv = os.path.join(bb.data.getVar('FILE_DIRNAME', d, 1), "site-" + bb.data.getVar('PV', d, 1))
-       for i in sites:
-               fname = os.path.join(path_pkgv, i)
-               if os.path.exists(fname):
-                       sitefiles += fname + " "
-
-       # Now check for siteconfig cache files
-       path_siteconfig = bb.data.getVar('SITECONFIG_SYSROOTCACHE', d, 1)
-       if os.path.isdir(path_siteconfig):
-               for i in os.listdir(path_siteconfig):
-                       fname = os.path.join(path_siteconfig, i)
-                       sitefiles += fname + " "
-
-       bb.debug(1, "SITE files " + sitefiles);
-       return sitefiles
+def siteinfo_get_files(d):
+    sitedata = siteinfo_data(d)
+    sitefiles = ""
+    for path in d.getVar("BBPATH", True).split(":"):
+        for element in sitedata:
+            filename = os.path.join(path, "site", element)
+            if os.path.exists(filename):
+                sitefiles += filename + " "
 
-def siteinfo_get_endianess(d):
-       info = get_siteinfo_list(d)
-       if 'endian-little' in info:
-              return "le"
-       elif 'endian-big' in info:
-              return "be"
-       bb.error("Site info could not determine endianess for target")
+    # Now check for siteconfig cache files
+    path_siteconfig = bb.data.getVar('SITECONFIG_SYSROOTCACHE', d, 1)
+    if os.path.isdir(path_siteconfig):
+        for i in os.listdir(path_siteconfig):
+            filename = os.path.join(path_siteconfig, i)
+            sitefiles += filename + " "
 
-def siteinfo_get_bits(d):
-       info = get_siteinfo_list(d)
-       if 'bit-32' in info:
-              return "32"
-       elif 'bit-64' in info:
-              return "64"
-       bb.error("Site info could not determine bit size for target")
+    return sitefiles
 
 #
 # Make some information available via variables
 #
-SITEINFO_ENDIANESS  = "${@siteinfo_get_endianess(d)}"
-SITEINFO_BITS       = "${@siteinfo_get_bits(d)}"
 SITECONFIG_SYSROOTCACHE = "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d"
-
diff --git a/meta/site/common-linux b/meta/site/common-linux
new file mode 100644
index 0000000..e69de29
-- 
1.7.3.4

[CONSOLIDATED PULL 08/20] tcmode-default: set preferred version also for (e)glibc-locale

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/conf/distro/include/tcmode-default.inc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index e27a1b4..86538f1 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -50,10 +50,12 @@ PREFERRED_VERSION_binutils-cross-canadian ?= "${BINUVERSION}"
 PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
 PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}"
 PREFERRED_VERSION_glibc ?= "${GLIBCVERSION}"
+PREFERRED_VERSION_glibc-locale ?= "${GLIBCVERSION}"
 PREFERRED_VERSION_glibc-nativesdk ?= "${GLIBCVERSION}"
 PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}"
 PREFERRED_VERSION_glibc-initial-nativesdk ?= "${GLIBCVERSION}"
 PREFERRED_VERSION_eglibc                   ?= "${EGLIBCVERSION}"
+PREFERRED_VERSION_eglibc-locale            ?= "${EGLIBCVERSION}"
 PREFERRED_VERSION_eglibc-nativesdk         ?= "${EGLIBCVERSION}"
 PREFERRED_VERSION_eglibc-initial           ?= "${EGLIBCVERSION}"
 PREFERRED_VERSION_eglibc-initial-nativesdk ?= "${EGLIBCVERSION}"
-- 
1.7.3.4

[CONSOLIDATED PULL 09/20] eglibc-package: don't fail without localedef/gconv

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

* in some cases we don't have localedef/gconv built
  ie when DISTRO_FEATURES lacks one of libc-charsets, libc-locales, libc-locale-code
  then is better ignore localedef/gconv instead of do_install_locale
  failing like in this bugreport:
  http://bugzilla.yoctoproject.org/show_bug.cgi?id=1209

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-core/eglibc/eglibc-package.inc |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index faf68f7..9e71150 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -98,8 +98,12 @@ do_install_locale () {
 	if [ "${base_libdir}" != "${libdir}" ]; then
 		cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
 	fi
-	mv ${D}${bindir}/localedef ${dest}${bindir}
-	mv ${D}${libdir}/gconv ${dest}${libdir}
+	if [ -f ${D}${bindir}/localedef ]; then
+		mv -f ${D}${bindir}/localedef ${dest}${bindir}
+	fi
+	if [ -f ${D}${libdir}/gconv ]; then
+		mv -f ${D}${libdir}/gconv ${dest}${libdir}
+	fi
 	cp -fpPR ${D}${libdir}/* ${dest}${libdir}
         mv ${D}${datadir}/i18n ${dest}${datadir}
 	cp -fpPR ${D}${datadir}/* ${dest}${datadir}
-- 
1.7.3.4

[CONSOLIDATED PULL 10/20] python: save Makefile.sysroot in do_compile

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

* otherwise calling do_install twice results in Makefile.sysroot == Makefile.orig and distutils using wrong LIBDIR (from host)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-devtools/python/python_2.6.6.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index 800ba04..76f32f2 100644
--- a/meta/recipes-devtools/python/python_2.6.6.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.bb
@@ -1,7 +1,7 @@
 require python.inc
 DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.8"
+PR = "${INC_PR}.9"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
 
 DISTRO_SRC_URI ?= "file://sitecustomize.py"
@@ -54,6 +54,9 @@ do_compile() {
 	sed -i -e 's,${includedir},${STAGING_INCDIR},' Makefile
 	sed -i -e 's,${libdir},${STAGING_LIBDIR},' Makefile
 	install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
+	# save copy of it now, because if we do it in do_install and 
+	# then call do_install twice we get Makefile.orig == Makefile.sysroot
+	install -m 0644 Makefile Makefile.sysroot
 
 	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
 		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
@@ -75,7 +78,6 @@ do_compile() {
 do_install() {
 	# make install needs the original Makefile, or otherwise the inclues would
 	# go to ${D}${STAGING...}/...
-	install -m 0644 Makefile Makefile.sysroot
 	install -m 0644 Makefile.orig Makefile
 	
 	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
@@ -86,7 +88,6 @@ do_install() {
 		DESTDIR=${D} LIBDIR=${libdir} install
 
 	install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
-	rm Makefile.sysroot
 
 	if [ -e ${WORKDIR}/sitecustomize.py ]; then
 		install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN}
-- 
1.7.3.4

[CONSOLIDATED PULL 11/20] python: add patch to fix cross compilation on host with linux-3.0

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../python/python/07-linux3-regen-fix.patch        |   18 ++++++++++++++++++
 meta/recipes-devtools/python/python_2.6.6.bb       |    1 +
 2 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python/07-linux3-regen-fix.patch

diff --git a/meta/recipes-devtools/python/python/07-linux3-regen-fix.patch b/meta/recipes-devtools/python/python/07-linux3-regen-fix.patch
new file mode 100644
index 0000000..d7fb313
--- /dev/null
+++ b/meta/recipes-devtools/python/python/07-linux3-regen-fix.patch
@@ -0,0 +1,18 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Without this patch it calls cross-compiled python if host is running linux-3.0
+python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
+| ./regen: line 3: /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-2.6.6-nk2.8/Python-2.6.6/python: cannot execute binary file
+
+diff -uNr Python-2.6.6.orig//Lib/plat-linux3/regen Python-2.6.6/Lib/plat-linux3/regen
+--- Python-2.6.6.orig//Lib/plat-linux3/regen	1970-01-01 01:00:00.000000000 +0100
++++ Python-2.6.6/Lib/plat-linux3/regen	2001-08-09 14:48:17.000000000 +0200
+@@ -0,0 +1,8 @@
++#! /bin/sh
++case `uname` in
++Linux*)	;;
++*)	echo Probably not on a Linux system 1>&2
++	exit 1;;
++esac
++set -v
++h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/dlfcn.h
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index 76f32f2..598fea8 100644
--- a/meta/recipes-devtools/python/python_2.6.6.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.bb
@@ -15,6 +15,7 @@ SRC_URI = "\
   file://05-enable-ctypes-cross-build.patch \
   file://06-ctypes-libffi-fix-configure.patch \
   file://06-avoid_usr_lib_termcap_path_in_linking.patch \
+  file://07-linux3-regen-fix.patch \
   file://99-ignore-optimization-flag.patch \
   ${DISTRO_SRC_URI} \
   file://multilib.patch \
-- 
1.7.3.4

[CONSOLIDATED PULL 12/20] clutter-box2d: fix isfinite.patch

[Saul Wold]

The original patch lost ^M and was not appliable.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../clutter/clutter-box2d/isfinite.patch           |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch b/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch
index fd2bf74..bcdbe24 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch
+++ b/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch
@@ -7,13 +7,13 @@ Upstream-Status: Pending
 Index: clutter-box2d-0.10.0/box2d/Source/Common/b2Math.h
 ===================================================================
 --- clutter-box2d-0.10.0.orig/box2d/Source/Common/b2Math.h	2008-12-16 06:42:10.000000000 -0800
-+++ clutter-box2d-0.10.0/box2d/Source/Common/b2Math.h	2011-07-17 02:10:29.833825198 -0700
++++ clutter-box2d-0.10.0/box2d/Source/Common/b2Math.h	2011-07-20 16:41:02.046430743 -0700
 @@ -60,7 +60,7 @@
- #ifdef _MSC_VER
- 	return _finite(x) != 0;
- #else
--	return finite(x) != 0;
-+	return std::isfinite(x) != 0;
- #endif
- }
- 
+ #ifdef _MSC_VER
+ 	return _finite(x) != 0;
+ #else
+-	return finite(x) != 0;
++	return std::isfinite(x) != 0;
+ #endif
+ }
+ 
-- 
1.7.3.4

[CONSOLIDATED PULL 13/20] gettext: Add depends to gettext to avoid host contamination

[Saul Wold]

[YOCTO #1242]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/gettext/gettext_0.18.1.1.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 0b11a90..cc0129f 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -5,9 +5,9 @@ SECTION = "libs"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r1"
-DEPENDS = "gettext-native virtual/libiconv ncurses expat"
-DEPENDS_virtclass-native = ""
+PR = "r2"
+DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat"
+DEPENDS_virtclass-native = "libxml2-native"
 PROVIDES = "virtual/libintl virtual/gettext"
 PROVIDES_virtclass-native = ""
 CONFLICTS_${PN} = "proxy-libintl"
-- 
1.7.3.4

[CONSOLIDATED PULL 14/20] Make intltool use perlnative instead of perl on host

[Saul Wold]

From: Matthew McClintock <msm@freescale.com>

intltool recipe was using perl from the host instead of perl from
poky. This forces the recipe to use poky's perl (along with perl
modules it pulls in)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 meta/recipes-devtools/intltool/intltool.inc       |    2 +-
 meta/recipes-devtools/intltool/intltool_0.40.6.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
index a4bccd3..c934654 100644
--- a/meta/recipes-devtools/intltool/intltool.inc
+++ b/meta/recipes-devtools/intltool/intltool.inc
@@ -10,7 +10,7 @@ DEPENDS = "libxml-parser-perl-native"
 #RDEPENDS_${PN} = "libxml-parser-perl"
 RRECOMMENDS_${PN} = "perl-modules"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig perlnative
 
 export PERL_virtclass-native = "/usr/bin/env perl"
 BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
index ea67144..c7938e5 100644
--- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
@@ -1,7 +1,7 @@
 require intltool.inc
 LICENSE="GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r2"
+PR = "r3"
 
 SRC_URI_append = " file://intltool-nowarn-0.40.0.patch"
 
-- 
1.7.3.4

[CONSOLIDATED PULL 15/20] polkit: inherit perlnative

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

* otherwise perl from host is used and if there isn't libxml-parser-perl installed on host it fails with:
  checking for XML::Parser... configure: error: XML::Parser perl module is required for intltool

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-extended/polkit/polkit_0.101.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/polkit/polkit_0.101.bb b/meta/recipes-extended/polkit/polkit_0.101.bb
index 6769914..fed3baf 100644
--- a/meta/recipes-extended/polkit/polkit_0.101.bb
+++ b/meta/recipes-extended/polkit/polkit_0.101.bb
@@ -13,7 +13,7 @@ DEPENDS = "libpam expat dbus-glib eggdbus intltool"
 RDEPENDS_${PN} = "libpam"
 EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig perlnative
 
 FILES_${PN} += "${libdir}/${PN}-1/extensions/*.so \
                 ${datadir}/${PN}-1/actions/* \
-- 
1.7.3.4

[CONSOLIDATED PULL 16/20] shared-mime-info: inherit perlnative

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

* otherwise perl from host is used and if there isn't libxml-parser-perl
  installed on host it fails with:
  checking for XML::Parser... configure: error: XML::Parser perl module is required for intltool

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../shared-mime-info/shared-mime-info.inc          |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
index 64eef9d..8b10535 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
@@ -10,7 +10,7 @@ DEPENDS_virtclass-native = "libxml2-native intltool-native glib-2.0-native"
 
 SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.bz2"
 
-inherit autotools pkgconfig gettext
+inherit autotools pkgconfig gettext perlnative
 
 EXTRA_OECONF = "--disable-update-mimedb"
 
-- 
1.7.3.4

[CONSOLIDATED PULL 17/20] xkeyboard-config: inherit perlnative

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

* otherwise perl from host is used and if there isn't libxml-parser-perl
  installed on host it fails with:
  checking for XML::Parser... configure: error: XML::Parser perl module is required for intltool

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../xorg-lib/xkeyboard-config_2.1.bb               |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb
index b077fa3..5633d9c 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb
@@ -26,7 +26,7 @@ EXTRA_OECONF = "--with-xkb-rules-symlink=xorg"
 RDEPENDS_${PN} += "xkbcomp"
 FILES_${PN} += "${datadir}/X11/xkb"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig perlnative
 
 do_install_append () {
     install -d ${D}/usr/share/X11/xkb/compiled
-- 
1.7.3.4

[CONSOLIDATED PULL 18/20] avahi: inherit perlnative

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

* otherwise perl from host is used and if there isn't libxml-parser-perl
  installed on host it fails with:
  checking for XML::Parser... configure: error: XML::Parser perl module is required for intltool

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-connectivity/avahi/avahi.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index dc7a5ae..5695403 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -21,7 +21,7 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
           file://99avahi-autoipd \
           file://initscript.patch"
 
-inherit autotools pkgconfig update-rc.d gettext
+inherit autotools pkgconfig update-rc.d gettext perlnative
 
 EXTRA_OECONF = "--with-distro=debian \
              --with-avahi-priv-access-group=adm \
-- 
1.7.3.4

[CONSOLIDATED PULL 19/20] vte: inherit perlnative

[Saul Wold]

From: Martin Jansa <Martin.Jansa@gmail.com>

* otherwise perl from host is used and if there isn't libxml-parser-perl
  installed on host it fails with:
  checking for XML::Parser... configure: error: XML::Parser perl module is required for intltool

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-support/vte/vte.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 6138f8c..1ff0ba0 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
@@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1+"
 DEPENDS = " glib-2.0 gtk+ intltool-native ncurses"
 RDEPENDS_libvte = "vte-termcap"
 
-inherit gnome
+inherit gnome perlnative
 
 EXTRA_OECONF = "--disable-gtk-doc --disable-python"
 
-- 
1.7.3.4

[CONSOLIDATED PULL 20/20] local.conf.sample: Add a note about ASSUME_PROVIDED for help2man

[Saul Wold]

From: Tom Rini <tom_rini@mentor.com>

Similar, but opposite of oe.dev example.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 meta/conf/local.conf.sample |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index c33dc0e..812b896 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -186,3 +186,6 @@ NO32LIBS = "1"
 # GNOME, SCREEN, XTERM and KONSOLE
 #TERMCMD = "${KONSOLE_TERMCMD}"
 #TERMCMDRUN = "${KONSOLE_TERMCMDRUN}"
+
+# Uncomment this if your host distribution provides the help2man tool.
+#ASSUME_PROVIDED += "help2man-native"
-- 
1.7.3.4

Re: [CONSOLIDATED PULL 14/20] Make intltool use perlnative instead of perl on host

[Khem Raj]

On Thu, Jul 21, 2011 at 12:53 AM, Saul Wold <sgw@linux.intel.com> wrote:
>
> -inherit autotools pkgconfig
> +inherit autotools pkgconfig perlnative
>
>  export PERL_virtclass-native = "/usr/bin/env perl"

is the above line still needed


>  BBCLASSEXTEND = "native"
>

Re: [CONSOLIDATED PULL 14/20] Make intltool use perlnative instead of perl on host

[Tom Rini]

On 07/21/2011 11:47 AM, Khem Raj wrote:
> On Thu, Jul 21, 2011 at 12:53 AM, Saul Wold <sgw@linux.intel.com> wrote:
>>
>> -inherit autotools pkgconfig
>> +inherit autotools pkgconfig perlnative
>>
>>  export PERL_virtclass-native = "/usr/bin/env perl"
> 
> is the above line still needed

It's actively wrong now and needs to be /usr/bin/env nativeperl (which
is a wrapper script to get to perl-native/perl).

-- 
Tom Rini
Mentor Graphics Corporation

Re: [CONSOLIDATED PULL 00/20] July 21, 2011

[Richard Purdie]

On Thu, 2011-07-21 at 00:52 -0700, Saul Wold wrote:
> Review and tested, the inherit perlnatives are needed.
>
> The following changes since commit 0d03800caffc2341b74190d38f7a372223c89f4c:
> 
>   lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib (2011-07-20 15:43:43 +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
> 
> Martin Jansa (9):
>   tcmode-default: set preferred version also for (e)glibc-locale
>   eglibc-package: don't fail without localedef/gconv
>   python: save Makefile.sysroot in do_compile
>   python: add patch to fix cross compilation on host with linux-3.0
>   polkit: inherit perlnative
>   shared-mime-info: inherit perlnative
>   xkeyboard-config: inherit perlnative
>   avahi: inherit perlnative
>   vte: inherit perlnative
> 
> Matthew McClintock (2):
>   Add endianess macros used by previous endian-ness_handling.patch
>   Make intltool use perlnative instead of perl on host
> 
> Saul Wold (2):
>   clutter-box2d: fix isfinite.patch
>   gettext: Add depends to gettext to avoid host contamination
> 
> Tom Rini (7):
>   python-native: Mangle scripts to use /usr/bin/env python, bump PR
>   gnome-doc-utils: Use /usr/bin/env python in xml2po, bump PR
>   perl-native: Add a perl-native wrapper in the normal bindir
>   cpan.bbclass: Perform more mangling for perl path
>   icon-naming-utils-native: Fix long path to perl in icon-name-mapping
>   siteinfo.bbclass: Port over oe.dev logic for site files
>   local.conf.sample: Add a note about ASSUME_PROVIDED for help2man

Thanks Saul, I merged this minus the perlnative pieces since I think we
might be able to solve this in a better way and we should at least
discuss that.

Cheers,

Richard

Re: [CONSOLIDATED PULL 14/20] Make intltool use perlnative instead of perl on host

[Richard Purdie]

On Thu, 2011-07-21 at 11:57 -0700, Tom Rini wrote:
> On 07/21/2011 11:47 AM, Khem Raj wrote:
> > On Thu, Jul 21, 2011 at 12:53 AM, Saul Wold <sgw@linux.intel.com> wrote:
> >>
> >> -inherit autotools pkgconfig
> >> +inherit autotools pkgconfig perlnative
> >>
> >>  export PERL_virtclass-native = "/usr/bin/env perl"
> > 
> > is the above line still needed
> 
> It's actively wrong now and needs to be /usr/bin/env nativeperl (which
> is a wrapper script to get to perl-native/perl).

Patch please :)

Cheers,

Richard

Re: [CONSOLIDATED PULL 00/20] July 21, 2011

[Kumar Gala]

On Jul 21, 2011, at 3:43 PM, Richard Purdie wrote:

> On Thu, 2011-07-21 at 00:52 -0700, Saul Wold wrote:
>> Review and tested, the inherit perlnatives are needed.
>> 
>> The following changes since commit 0d03800caffc2341b74190d38f7a372223c89f4c:
>> 
>>  lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib (2011-07-20 15:43:43 +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
>> 
>> Martin Jansa (9):
>>  tcmode-default: set preferred version also for (e)glibc-locale
>>  eglibc-package: don't fail without localedef/gconv
>>  python: save Makefile.sysroot in do_compile
>>  python: add patch to fix cross compilation on host with linux-3.0
>>  polkit: inherit perlnative
>>  shared-mime-info: inherit perlnative
>>  xkeyboard-config: inherit perlnative
>>  avahi: inherit perlnative
>>  vte: inherit perlnative
>> 
>> Matthew McClintock (2):
>>  Add endianess macros used by previous endian-ness_handling.patch
>>  Make intltool use perlnative instead of perl on host
>> 
>> Saul Wold (2):
>>  clutter-box2d: fix isfinite.patch
>>  gettext: Add depends to gettext to avoid host contamination
>> 
>> Tom Rini (7):
>>  python-native: Mangle scripts to use /usr/bin/env python, bump PR
>>  gnome-doc-utils: Use /usr/bin/env python in xml2po, bump PR
>>  perl-native: Add a perl-native wrapper in the normal bindir
>>  cpan.bbclass: Perform more mangling for perl path
>>  icon-naming-utils-native: Fix long path to perl in icon-name-mapping
>>  siteinfo.bbclass: Port over oe.dev logic for site files
>>  local.conf.sample: Add a note about ASSUME_PROVIDED for help2man
> 
> Thanks Saul, I merged this minus the perlnative pieces since I think we
> might be able to solve this in a better way and we should at least
> discuss that.
> 
> Cheers,
> 
> Richard
> 

The version of:

clutter-box2d: fix isfinite.patch

in poky.git seems to still be broken

- k

Re: [CONSOLIDATED PULL 00/20] July 21, 2011

[Richard Purdie]

On Fri, 2011-07-22 at 02:49 -0500, Kumar Gala wrote:
> On Jul 21, 2011, at 3:43 PM, Richard Purdie wrote:
> 
> > On Thu, 2011-07-21 at 00:52 -0700, Saul Wold wrote:
> >> Review and tested, the inherit perlnatives are needed.
> >> 
> >> The following changes since commit 0d03800caffc2341b74190d38f7a372223c89f4c:
> >> 
> >>  lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib (2011-07-20 15:43:43 +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
> >> 
> >> Martin Jansa (9):
> >>  tcmode-default: set preferred version also for (e)glibc-locale
> >>  eglibc-package: don't fail without localedef/gconv
> >>  python: save Makefile.sysroot in do_compile
> >>  python: add patch to fix cross compilation on host with linux-3.0
> >>  polkit: inherit perlnative
> >>  shared-mime-info: inherit perlnative
> >>  xkeyboard-config: inherit perlnative
> >>  avahi: inherit perlnative
> >>  vte: inherit perlnative
> >> 
> >> Matthew McClintock (2):
> >>  Add endianess macros used by previous endian-ness_handling.patch
> >>  Make intltool use perlnative instead of perl on host
> >> 
> >> Saul Wold (2):
> >>  clutter-box2d: fix isfinite.patch
> >>  gettext: Add depends to gettext to avoid host contamination
> >> 
> >> Tom Rini (7):
> >>  python-native: Mangle scripts to use /usr/bin/env python, bump PR
> >>  gnome-doc-utils: Use /usr/bin/env python in xml2po, bump PR
> >>  perl-native: Add a perl-native wrapper in the normal bindir
> >>  cpan.bbclass: Perform more mangling for perl path
> >>  icon-naming-utils-native: Fix long path to perl in icon-name-mapping
> >>  siteinfo.bbclass: Port over oe.dev logic for site files
> >>  local.conf.sample: Add a note about ASSUME_PROVIDED for help2man
> > 
> > Thanks Saul, I merged this minus the perlnative pieces since I think we
> > might be able to solve this in a better way and we should at least
> > discuss that.
> > 
> > Cheers,
> > 
> > Richard
> > 
> 
> The version of:
> 
> clutter-box2d: fix isfinite.patch
> 
> in poky.git seems to still be broken

There is something in my patch workflow which seems to corrupt dos line
endings. I've manually fixed the patches which were out of sync in poky
compared with OE-Core and am looking into how this happened with a view
to fixing the scripts.

Cheers,

Richard

Re: [CONSOLIDATED PULL 00/20] July 21, 2011

[Richard Purdie]

On Fri, 2011-07-22 at 10:05 +0100, Richard Purdie wrote:
> On Fri, 2011-07-22 at 02:49 -0500, Kumar Gala wrote:
> > On Jul 21, 2011, at 3:43 PM, Richard Purdie wrote:
> > 
> > > On Thu, 2011-07-21 at 00:52 -0700, Saul Wold wrote:
> > >> Review and tested, the inherit perlnatives are needed.
> > >> 
> > >> The following changes since commit 0d03800caffc2341b74190d38f7a372223c89f4c:
> > >> 
> > >>  lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib (2011-07-20 15:43:43 +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
> > >> 
> > >> Martin Jansa (9):
> > >>  tcmode-default: set preferred version also for (e)glibc-locale
> > >>  eglibc-package: don't fail without localedef/gconv
> > >>  python: save Makefile.sysroot in do_compile
> > >>  python: add patch to fix cross compilation on host with linux-3.0
> > >>  polkit: inherit perlnative
> > >>  shared-mime-info: inherit perlnative
> > >>  xkeyboard-config: inherit perlnative
> > >>  avahi: inherit perlnative
> > >>  vte: inherit perlnative
> > >> 
> > >> Matthew McClintock (2):
> > >>  Add endianess macros used by previous endian-ness_handling.patch
> > >>  Make intltool use perlnative instead of perl on host
> > >> 
> > >> Saul Wold (2):
> > >>  clutter-box2d: fix isfinite.patch
> > >>  gettext: Add depends to gettext to avoid host contamination
> > >> 
> > >> Tom Rini (7):
> > >>  python-native: Mangle scripts to use /usr/bin/env python, bump PR
> > >>  gnome-doc-utils: Use /usr/bin/env python in xml2po, bump PR
> > >>  perl-native: Add a perl-native wrapper in the normal bindir
> > >>  cpan.bbclass: Perform more mangling for perl path
> > >>  icon-naming-utils-native: Fix long path to perl in icon-name-mapping
> > >>  siteinfo.bbclass: Port over oe.dev logic for site files
> > >>  local.conf.sample: Add a note about ASSUME_PROVIDED for help2man
> > > 
> > > Thanks Saul, I merged this minus the perlnative pieces since I think we
> > > might be able to solve this in a better way and we should at least
> > > discuss that.
> > > 
> > > Cheers,
> > > 
> > > Richard
> > > 
> > 
> > The version of:
> > 
> > clutter-box2d: fix isfinite.patch
> > 
> > in poky.git seems to still be broken
> 
> There is something in my patch workflow which seems to corrupt dos line
> endings. I've manually fixed the patches which were out of sync in poky
> compared with OE-Core and am looking into how this happened with a view
> to fixing the scripts.

The reason is we need to use "git am --keep-cr". I've updated my local
scripts and we're also checking the layer handling tools. I haven't
switched to them yet as we haven't had a lull in the patches to allow me
to make the transition. I've got that pencilled in for after multilib is
done.

Cheers,

Richard

Re: [CONSOLIDATED PULL 00/20] July 21, 2011

[Khem Raj]

> 
> There is something in my patch workflow which seems to corrupt dos line
> endings. I've manually fixed the patches which were out of sync in poky
> compared with OE-Core and am looking into how this happened with a view
> to fixing the scripts.

git am hoses them

> 
> Cheers,
> 
> Richard
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
-Khem

Re: [CONSOLIDATED PULL 00/20] July 21, 2011

[Khem Raj]

> > There is something in my patch workflow which seems to corrupt dos line
> > endings. I've manually fixed the patches which were out of sync in poky
> > compared with OE-Core and am looking into how this happened with a view
> > to fixing the scripts.
> 
> The reason is we need to use "git am --keep-cr". I've updated my local
> scripts and we're also checking the layer handling tools. I haven't
> switched to them yet as we haven't had a lull in the patches to allow me
> to make the transition. I've got that pencilled in for after multilib is
> done.

configuring the clones repo with

git config am.keepcr true

will make it automatic

> 
> Cheers,
> 
> Richard
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
-Khem