[PATCH v2 00/16] python-native: Put binaries in seperate directory

[PATCH v2 00/16] python-native: Put binaries in seperate directory

[Morgan Little]

I updated python-native like it was suggest by Richard here:
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-June/024644.html

It is to resolve an issue that comes up when python-native is building and 
autoconf finds the binary but not the libraries. This fix moves where the 
binaries are installed to remove this issue and use the system's python.

I have used bitbake world to build to make sure most things are build and 
have added all of the recipes that I found were affected. I will be building 
more to make sure I managed to get all of them.

-----V2 Change-----
Updated distutils-base to inherit pythonnative

Removed added pythonnative inherit in distutils

Removed added inherit for pythonnative from python-dbus, python-pygtk,
python-setuptools, python-gst, python-pygobject since they get the inherit from
distutils-base

Updated perf for the change


The following changes since commit 28715eff6dff3415b1d7b0be8cbb465c417e307f:
  Richard Purdie (1):
        boot-directdisk: Fix kernel location after STAGING_KERNEL_DIR change

are available in the git repository at:

  git@github.com:morganlittle/oe-core.git master

Morgan Little (16):
      python-native: Put binaries in seperate directory
      python: Update for python-native changes
      python-scons-native: Update for python-native changes
      python-pyrex-native: Update for python-native changes
      mklibs-native: Update for python-native changes
      telepathy-glib: Update for python-native changes
      telepathy-python: Update for python-native changes
      libxml2: Update for python-native changes
      gnome-doc-utils: Update for python-native changes
      gobject-introspection: Update for python-native changes
      mesa-common: Update for python-native changes
      libxcb: Update for python-native changes
      xcb-proto: Update for python-native changes
      perf: Update for python-native changes
      kernelshark: Update for python-native changes
      trace-cmd: Update for python-native changes

 meta/classes/distutils-base.bbclass                |    2 +-
 meta/classes/distutils.bbclass                     |    8 ++++----
 meta/classes/pythonnative.bbclass                  |    3 +++
 .../telepathy/telepathy-glib_0.19.2.bb             |    4 ++--
 .../telepathy/telepathy-python_0.15.19.bb          |    4 ++--
 meta/recipes-core/libxml/libxml2.inc               |    2 +-
 .../mklibs/mklibs-native_0.1.34.bb                 |    4 ++--
 .../recipes-devtools/python/python-native_2.7.3.bb |   10 ++++++----
 .../python/python-pyrex-native_0.9.9.bb            |    4 ++--
 .../python/python-scons-native_2.1.0.bb            |    4 ++--
 meta/recipes-devtools/python/python_2.7.3.bb       |   18 +++++++++---------
 meta/recipes-gnome/gnome/gnome-doc-utils.inc       |    2 +-
 .../gnome/gobject-introspection_1.32.1.bb          |    2 +-
 .../gnome/gobject-introspection_git.bb             |    2 +-
 meta/recipes-graphics/mesa/mesa-common.inc         |    4 ++--
 meta/recipes-graphics/xcb/libxcb.inc               |    2 +-
 meta/recipes-graphics/xcb/xcb-proto.inc            |    2 +-
 meta/recipes-kernel/perf/perf_3.4.bb               |    2 +-
 meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb   |    4 ++--
 meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb     |    4 ++--
 20 files changed, 46 insertions(+), 41 deletions(-)
 create mode 100644 meta/classes/pythonnative.bbclass

[PATCH v2 01/16] python-native: Put binaries in seperate directory

[Morgan Little]

Update python-native to install the binaries in the python-native directory,
add pythonnative.bbclass to let recipes that need python-native use the
binaries and update disutils access the new binaries. Update distutils-base
to inherit pythonnative.
---
 meta/classes/distutils-base.bbclass                |    2 +-
 meta/classes/distutils.bbclass                     |    8 ++++----
 meta/classes/pythonnative.bbclass                  |    3 +++
 .../recipes-devtools/python/python-native_2.7.3.bb |   10 ++++++----
 4 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 meta/classes/pythonnative.bbclass

diff --git a/meta/classes/distutils-base.bbclass b/meta/classes/distutils-base.bbclass
index 6d18e08..c761b36 100644
--- a/meta/classes/distutils-base.bbclass
+++ b/meta/classes/distutils-base.bbclass
@@ -1,5 +1,5 @@
 DEPENDS  += "${@["python-native python", ""][(d.getVar('PACKAGES', True) == '')]}"
 RDEPENDS_${PN} += "${@['', 'python-core']['${PN}' == '${BPN}']}"
 
-inherit distutils-common-base
+inherit distutils-common-base pythonnative
 
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index bcddf8d..690df73 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -11,14 +11,14 @@ distutils_do_compile() {
          STAGING_INCDIR=${STAGING_INCDIR} \
          STAGING_LIBDIR=${STAGING_LIBDIR} \
          BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-         ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \
+         ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build ${DISTUTILS_BUILD_ARGS} || \
          bbfatal "python setup.py build_ext execution failed."
 }
 
 distutils_stage_headers() {
         install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
+        ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
         bbfatal "python setup.py install_headers execution failed."
 }
 
@@ -28,7 +28,7 @@ distutils_stage_all() {
         install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
         PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
+        ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
         bbfatal "python setup.py install (stage) execution failed."
 }
 
@@ -38,7 +38,7 @@ distutils_do_install() {
         STAGING_LIBDIR=${STAGING_LIBDIR} \
         PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \
+        ${STAGING_BINDIR_NATIVE}/python-native/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \
         bbfatal "python setup.py install execution failed."
 
         for i in `find ${D} -name "*.py"` ; do \
diff --git a/meta/classes/pythonnative.bbclass b/meta/classes/pythonnative.bbclass
new file mode 100644
index 0000000..bc346da
--- /dev/null
+++ b/meta/classes/pythonnative.bbclass
@@ -0,0 +1,3 @@
+PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python"
+PATH_prepend = "${STAGING_BINDIR_NATIVE}/python-native:"
+DEPENDS += " python-native "
diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb b/meta/recipes-devtools/python/python-native_2.7.3.bb
index 50bf894..bfdcd12 100644
--- a/meta/recipes-devtools/python/python-native_2.7.3.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
@@ -1,6 +1,6 @@
 require python.inc
 DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI += "file://04-default-is-optimized.patch \
            file://05-enable-ctypes-cross-build.patch \
@@ -20,6 +20,8 @@ inherit native
 
 RPROVIDES += "python-distutils-native python-compression-native python-textutils-native python-core-native"
 
+EXTRA_OECONF += " --bindir=${bindir}/${PN}"
+
 EXTRA_OEMAKE = '\
   BUILD_SYS="" \
   HOST_SYS="" \
@@ -34,11 +36,11 @@ do_configure_prepend() {
 
 do_install() {
 	oe_runmake 'DESTDIR=${D}' install
-	install -d ${D}${bindir}/
-	install -m 0755 Parser/pgen ${D}${bindir}/
+	install -d ${D}${bindir}/${PN}
+	install -m 0755 Parser/pgen ${D}${bindir}/${PN}
 
 	# Make sure we use /usr/bin/env python
-	for PYTHSCRIPT in `grep -rIl ${bindir}/python ${D}${bindir}`; do
+	for PYTHSCRIPT in `grep -rIl ${bindir}/${PN}/python ${D}${bindir}/${PN}`; do
 		sed -i -e '1s|^#!.*|#!/usr/bin/env python|' $PYTHSCRIPT
 	done
 }
-- 
1.7.0.4

[PATCH v2 02/16] python: Update for python-native changes

[Morgan Little]

Add pythonnative onto the list of inherits and update the paths to the binaries
referenced in the recipe to the new paths.
---
 meta/recipes-devtools/python/python_2.7.3.bb |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb
index b736cc2..d27ff05 100644
--- a/meta/recipes-devtools/python/python_2.7.3.bb
+++ b/meta/recipes-devtools/python/python_2.7.3.bb
@@ -1,6 +1,6 @@
 require python.inc
 DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 DISTRO_SRC_URI ?= "file://sitecustomize.py"
 DISTRO_SRC_URI_linuxstdbase = ""
@@ -30,7 +30,7 @@ SRC_URI += "\
 
 S = "${WORKDIR}/Python-${PV}"
 
-inherit autotools multilib_header
+inherit autotools multilib_header pythonnative
 
 # The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources
 #Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :(
@@ -45,7 +45,7 @@ do_configure_prepend() {
 do_compile() {
         # regenerate platform specific files, because they depend on system headers
         cd Lib/plat-linux2
-        include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python \
+        include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python-native/python \
                 ${S}/Tools/scripts/h2py.py -i '(u_long)' \
                 ${STAGING_INCDIR}/dlfcn.h \
                 ${STAGING_INCDIR}/linux/cdrom.h \
@@ -89,8 +89,8 @@ do_compile() {
 
 	export CROSS_COMPILE="${TARGET_PREFIX}"
 
-	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
-		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
+	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
+		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
 		STAGING_LIBDIR=${STAGING_LIBDIR} \
 		STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
 		STAGING_INCDIR=${STAGING_INCDIR} \
@@ -99,8 +99,8 @@ do_compile() {
 
 	oe_libinstall -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR}
 
-	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
-		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
+	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
+		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
 		STAGING_LIBDIR=${STAGING_LIBDIR} \
 		STAGING_INCDIR=${STAGING_INCDIR} \
 		STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
@@ -115,8 +115,8 @@ do_install() {
 
 	export CROSS_COMPILE="${TARGET_PREFIX}"
 	
-	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
-		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
+	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
+		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
 		CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \
 		STAGING_LIBDIR=${STAGING_LIBDIR} \
 		STAGING_INCDIR=${STAGING_INCDIR} \
-- 
1.7.0.4

[PATCH v2 03/16] python-scons-native: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 .../python/python-scons-native_2.1.0.bb            |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/python/python-scons-native_2.1.0.bb b/meta/recipes-devtools/python/python-scons-native_2.1.0.bb
index ff94cf6..ec3f2f4 100644
--- a/meta/recipes-devtools/python/python-scons-native_2.1.0.bb
+++ b/meta/recipes-devtools/python/python-scons-native_2.1.0.bb
@@ -1,5 +1,5 @@
 require python-scons_${PV}.bb
-inherit native
+inherit native pythonnative
 DEPENDS = "python-native"
 RDEPENDS_${PN} = ""
-PR = "r1"
+PR = "r2"
-- 
1.7.0.4

[PATCH v2 04/16] python-pyrex-native: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 .../python/python-pyrex-native_0.9.9.bb            |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb b/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
index dcfc3f5..e8ef1aa 100644
--- a/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
+++ b/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb
@@ -1,5 +1,5 @@
 require python-pyrex_${PV}.bb
-inherit native
+inherit native pythonnative
 DEPENDS = "python-native"
 RDEPENDS_${PN} = ""
-PR = "r2"
+PR = "r3"
-- 
1.7.0.4

[PATCH v2 05/16] mklibs-native: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 .../mklibs/mklibs-native_0.1.34.bb                 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/mklibs/mklibs-native_0.1.34.bb b/meta/recipes-devtools/mklibs/mklibs-native_0.1.34.bb
index f2c3033..eeb3136 100644
--- a/meta/recipes-devtools/mklibs/mklibs-native_0.1.34.bb
+++ b/meta/recipes-devtools/mklibs/mklibs-native_0.1.34.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=98d31037b13d896e33890738ef01af64"
 DEPENDS = "python-native"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.gz \
 	file://ac_init_fix.patch\
@@ -15,7 +15,7 @@ SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.g
 SRC_URI[md5sum] = "afe0ed527ba96b8a882b5de350603007"
 SRC_URI[sha256sum] = "0c13c314f5c397529f58a5a02d57d83aeb4463d6a0d80b9374c6576ec37ed39f"
 
-inherit autotools gettext native
+inherit autotools gettext native pythonnative
 
 do_configure_prepend() {
 	sed "s+MKLIBS_VERSION+${PV}+" ${S}/configure.ac
-- 
1.7.0.4

[PATCH v2 06/16] telepathy-glib: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 .../telepathy/telepathy-glib_0.19.2.bb             |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb
index deba3bb..2c332e5 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection man
 HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
 DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib"
 LICENSE = "LGPLv2.1+"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz"
 
@@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "7e3c313ed08e26339deb603a615cec62a370131075514439f79f473f92
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e"
 
-inherit autotools pkgconfig gettext
+inherit autotools pkgconfig gettext pythonnative
 
 FILES_${PN} += "${datadir}/telepathy \
                 ${datadir}/dbus-1"
-- 
1.7.0.4

[PATCH v2 07/16] telepathy-python: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 .../telepathy/telepathy-python_0.15.19.bb          |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
index 383e29a..f83bb2c 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
@@ -11,9 +11,9 @@ SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz
            file://remove_duplicate_install.patch \
            file://telepathy-python_fix_for_automake_1.12.patch"
 
-PR = "r5"
+PR = "r6"
 
-inherit autotools
+inherit autotools pythonnative
 
 SRC_URI[md5sum] = "f7ca25ab3c88874015b7e9728f7f3017"
 SRC_URI[sha256sum] = "244c0e1bf4bbd78ae298ea659fe10bf3a73738db550156767cc2477aedf72376"
-- 
1.7.0.4

[PATCH v2 08/16] libxml2: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 meta/recipes-core/libxml/libxml2.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index d70fe47..91fbaf4 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -17,7 +17,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \
            file://ansidecl.patch"
 
 
-inherit autotools pkgconfig binconfig
+inherit autotools pkgconfig binconfig pythonnative
 
 # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
 do_configure_prepend () {
-- 
1.7.0.4

[PATCH v2 09/16] gnome-doc-utils: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 meta/recipes-gnome/gnome/gnome-doc-utils.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
index 08333db..3c9a50d 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
@@ -2,7 +2,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
 DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0"
 DEPENDS_virtclass-native = "libxml2-native libxslt-native intltool-native glib-2.0-native"
 
-inherit gnome gettext python-dir
+inherit gnome gettext python-dir pythonnative
 
 EXTRA_OECONF += "--disable-scrollkeeper"
 
-- 
1.7.0.4

[PATCH v2 10/16] gobject-introspection: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 .../gnome/gobject-introspection_1.32.1.bb          |    2 +-
 .../gnome/gobject-introspection_git.bb             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
index f51e83e..8e30df6 100644
--- a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
+++ b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \
                     file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-inherit autotools
+inherit autotools pythonnative
 
 do_configure_prepend () {
         echo "EXTRA_DIST = " > ${S}/gtk-doc.make
diff --git a/meta/recipes-gnome/gnome/gobject-introspection_git.bb b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
index 8352384..eb3b7e4 100644
--- a/meta/recipes-gnome/gnome/gobject-introspection_git.bb
+++ b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
@@ -17,7 +17,7 @@ DEFAULT_PREFERENCE = "-1"
 
 S = "${WORKDIR}/git"
 
-inherit autotools
+inherit autotools pythonnative
 
 BBCLASSEXTEND = "native"
 
-- 
1.7.0.4

[PATCH v2 11/16] mesa-common: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 meta/recipes-graphics/mesa/mesa-common.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index f697e67..120a256 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
 
-INC_PR = "r14"
+INC_PR = "r15"
 PE = "2"
 
 
@@ -26,7 +26,7 @@ PROVIDES = "virtual/libgl"
 # for mesa-dri and mesa-xlib
 FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig pythonnative
 
 EXTRA_OECONF = "--enable-glu \
                 --disable-glw \
-- 
1.7.0.4

[PATCH v2 12/16] libxcb: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 meta/recipes-graphics/xcb/libxcb.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xcb/libxcb.inc b/meta/recipes-graphics/xcb/libxcb.inc
index d3a5044..1517f8a 100644
--- a/meta/recipes-graphics/xcb/libxcb.inc
+++ b/meta/recipes-graphics/xcb/libxcb.inc
@@ -49,7 +49,7 @@ FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*"
 FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*"
 FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig pythonnative
 
 # XCBPROTO_XCBINCLUDEDIR is setup based on `pkg-config --variable=xcbincludedir xcb-proto`
 # but the xcbincludedir variable doesn't point into the staging area, so it needs some
-- 
1.7.0.4

[PATCH v2 13/16] xcb-proto: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 meta/recipes-graphics/xcb/xcb-proto.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xcb/xcb-proto.inc b/meta/recipes-graphics/xcb/xcb-proto.inc
index e93b1a2..feb9e4d 100644
--- a/meta/recipes-graphics/xcb/xcb-proto.inc
+++ b/meta/recipes-graphics/xcb/xcb-proto.inc
@@ -11,7 +11,7 @@ LICENSE = "MIT-X"
 
 SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig pythonnative
 
 PACKAGES += "python-xcbgen"
 
-- 
1.7.0.4

[PATCH v2 14/16] perf: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 meta/recipes-kernel/perf/perf_3.4.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-kernel/perf/perf_3.4.bb b/meta/recipes-kernel/perf/perf_3.4.bb
index 5bdd924..505c7b8 100644
--- a/meta/recipes-kernel/perf/perf_3.4.bb
+++ b/meta/recipes-kernel/perf/perf_3.4.bb
@@ -31,7 +31,7 @@ RDEPENDS_${PN} += "elfutils ${SCRIPTING_RDEPENDS}"
 
 PROVIDES = "virtual/perf"
 
-inherit kernel-arch
+inherit kernel-arch pythonnative
 
 # needed for building the tools/perf Python bindings
 inherit python-dir
-- 
1.7.0.4

[PATCH v2 15/16] kernelshark: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
index d18cb6a..21f4576 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
@@ -4,13 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e"
 
 SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5"
-PR = "r1"
+PR = "r2"
 PV = "1.2+git${SRCPV}"
 
 DEPENDS = "gtk+"
 RDEPENDS_${PN} = "trace-cmd"
 
-inherit pkgconfig
+inherit pkgconfig pythonnative
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \
            file://addldflags.patch \
-- 
1.7.0.4

[PATCH v2 16/16] trace-cmd: Update for python-native changes

[Morgan Little]

Add pythonnative to the inherits list
---
 meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
index 7f6f6cf..214d0f0 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://trace-input.c;beginline=5;endine=8;md5=c9c405aaf5cfc09582ec83cf6e83a020"
 
 SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5"
-PR = "r2"
+PR = "r3"
 PV = "1.2+git${SRCPV}"
 
-inherit pkgconfig
+inherit pkgconfig pythonnative
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \
            file://addldflags.patch \
-- 
1.7.0.4

Re: [PATCH v2 00/16] python-native: Put binaries in seperate directory

[Richard Purdie]

On Thu, 2012-07-19 at 13:46 -0400, Morgan Little wrote:
> I updated python-native like it was suggest by Richard here:
> http://lists.linuxtogo.org/pipermail/openembedded-core/2012-June/024644.html
> 
> It is to resolve an issue that comes up when python-native is building and 
> autoconf finds the binary but not the libraries. This fix moves where the 
> binaries are installed to remove this issue and use the system's python.
> 
> I have used bitbake world to build to make sure most things are build and 
> have added all of the recipes that I found were affected. I will be building 
> more to make sure I managed to get all of them.
> 
> -----V2 Change-----
> Updated distutils-base to inherit pythonnative
> 
> Removed added pythonnative inherit in distutils
> 
> Removed added inherit for pythonnative from python-dbus, python-pygtk,
> python-setuptools, python-gst, python-pygobject since they get the inherit from
> distutils-base
> 
> Updated perf for the change
> 
> 
> The following changes since commit 28715eff6dff3415b1d7b0be8cbb465c417e307f:
>   Richard Purdie (1):
>         boot-directdisk: Fix kernel location after STAGING_KERNEL_DIR change
> 
> are available in the git repository at:
> 
>   git@github.com:morganlittle/oe-core.git master
> 
> Morgan Little (16):
>       python-native: Put binaries in seperate directory
>       python: Update for python-native changes
>       python-scons-native: Update for python-native changes
>       python-pyrex-native: Update for python-native changes
>       mklibs-native: Update for python-native changes
>       telepathy-glib: Update for python-native changes
>       telepathy-python: Update for python-native changes
>       libxml2: Update for python-native changes
>       gnome-doc-utils: Update for python-native changes
>       gobject-introspection: Update for python-native changes
>       mesa-common: Update for python-native changes
>       libxcb: Update for python-native changes
>       xcb-proto: Update for python-native changes
>       perf: Update for python-native changes
>       kernelshark: Update for python-native changes
>       trace-cmd: Update for python-native changes

I've been testing this and making a more detailed review of the changes.
Firstly, I realised you were adding the pythonnative class to recipes
which never had DEPENDS = "python-native". That isn't right and
shouldn't be done for telepathy-glib, libxcb, kernelshark and
trace-cmd. 

gnome-doc-utils needed further attention. I've looked into it and I
think we need to put a wrapper around xmlto in the native case so that
we can use the full path to python. I'm going to submit a patch for
this.

You can see the version of this patch set I plan to merge on master-next
(dropping the above mentioned patches).

Cheers,

Richard

Re: [PATCH v2 00/16] python-native: Put binaries in seperate directory

[Saul Wold]

On 07/19/2012 10:46 AM, Morgan Little wrote:
> I updated python-native like it was suggest by Richard here:
> http://lists.linuxtogo.org/pipermail/openembedded-core/2012-June/024644.html
>
> It is to resolve an issue that comes up when python-native is building and
> autoconf finds the binary but not the libraries. This fix moves where the
> binaries are installed to remove this issue and use the system's python.
>
> I have used bitbake world to build to make sure most things are build and
> have added all of the recipes that I found were affected. I will be building
> more to make sure I managed to get all of them.
>
> -----V2 Change-----
> Updated distutils-base to inherit pythonnative
>
> Removed added pythonnative inherit in distutils
>
> Removed added inherit for pythonnative from python-dbus, python-pygtk,
> python-setuptools, python-gst, python-pygobject since they get the inherit from
> distutils-base
>
> Updated perf for the change
>
>
> The following changes since commit 28715eff6dff3415b1d7b0be8cbb465c417e307f:
>    Richard Purdie (1):
>          boot-directdisk: Fix kernel location after STAGING_KERNEL_DIR change
>
> are available in the git repository at:
>
>    git@github.com:morganlittle/oe-core.git master
>
> Morgan Little (16):
>        python-native: Put binaries in seperate directory
>        python: Update for python-native changes
>        python-scons-native: Update for python-native changes
>        python-pyrex-native: Update for python-native changes
>        mklibs-native: Update for python-native changes
>        telepathy-glib: Update for python-native changes
>        telepathy-python: Update for python-native changes
>        libxml2: Update for python-native changes
>        gnome-doc-utils: Update for python-native changes
>        gobject-introspection: Update for python-native changes
>        mesa-common: Update for python-native changes
>        libxcb: Update for python-native changes
>        xcb-proto: Update for python-native changes
>        perf: Update for python-native changes
>        kernelshark: Update for python-native changes
>        trace-cmd: Update for python-native changes
>
>   meta/classes/distutils-base.bbclass                |    2 +-
>   meta/classes/distutils.bbclass                     |    8 ++++----
>   meta/classes/pythonnative.bbclass                  |    3 +++
>   .../telepathy/telepathy-glib_0.19.2.bb             |    4 ++--
>   .../telepathy/telepathy-python_0.15.19.bb          |    4 ++--
>   meta/recipes-core/libxml/libxml2.inc               |    2 +-
>   .../mklibs/mklibs-native_0.1.34.bb                 |    4 ++--
>   .../recipes-devtools/python/python-native_2.7.3.bb |   10 ++++++----
>   .../python/python-pyrex-native_0.9.9.bb            |    4 ++--
>   .../python/python-scons-native_2.1.0.bb            |    4 ++--
>   meta/recipes-devtools/python/python_2.7.3.bb       |   18 +++++++++---------
>   meta/recipes-gnome/gnome/gnome-doc-utils.inc       |    2 +-
>   .../gnome/gobject-introspection_1.32.1.bb          |    2 +-
>   .../gnome/gobject-introspection_git.bb             |    2 +-
>   meta/recipes-graphics/mesa/mesa-common.inc         |    4 ++--
>   meta/recipes-graphics/xcb/libxcb.inc               |    2 +-
>   meta/recipes-graphics/xcb/xcb-proto.inc            |    2 +-
>   meta/recipes-kernel/perf/perf_3.4.bb               |    2 +-
>   meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb   |    4 ++--
>   meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb     |    4 ++--
>   20 files changed, 46 insertions(+), 41 deletions(-)
>   create mode 100644 meta/classes/pythonnative.bbclass
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Merged into OE-Core

Thanks
	Sau!