propagate from branch 'org.openembedded.dev' (head a6b798a43c05aef43ed650ab880f3edd386d0aa3)

            to branch 'org.openembedded.dev.avr32' (head 77e1041de2eef682f183f3f5199826818cb9c5b1)

6 files changed, 18 insertions, 9 deletions

diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb
index a64a4f96c8..ea6e257043 100644
--- a/packages/python/python-native_2.5.1.bb
+++ b/packages/python/python-native_2.5.1.bb
@@ -17,8 +17,8 @@ S = "${WORKDIR}/Python-${PV}"
 
 inherit autotools native
 
-prefix = "${STAGING_DIR}/${BUILD_SYS}"
-exec_prefix = "${STAGING_DIR}/${BUILD_SYS}"
+prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}"
+exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}"
 
 EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \
                 --without-cxx --with-signal-module --with-wctype-functions"
@@ -30,5 +30,5 @@ EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""'
 #}
 
 do_stage_append() {
-	install -m 0755 Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/
+	install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/
 }
diff --git a/packages/python/python-pygtk_2.10.3.bb b/packages/python/python-pygtk_2.10.3.bb
index ad1f36a205..78c76d47f9 100644
--- a/packages/python/python-pygtk_2.10.3.bb
+++ b/packages/python/python-pygtk_2.10.3.bb
@@ -17,7 +17,6 @@ EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
 
 inherit autotools pkgconfig distutils-base
 
-PACKAGES =+ "${PN}-dev"
 FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
 FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
 
diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
index e90b86bf1c..87776ff426 100644
--- a/packages/python/python-pygtk_2.10.4.bb
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -22,7 +22,6 @@ do_configure_prepend() {
 }
 
 
-PACKAGES =+ "${PN}-dev"
 FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
 FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
 
diff --git a/packages/python/python-pyusb_0.4.1.bb b/packages/python/python-pyusb_0.4.1.bb
new file mode 100644
index 0000000000..d449208fe1
--- /dev/null
+++ b/packages/python/python-pyusb_0.4.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "libusb Python Bindings"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "BSD"
+DEPENDS = "libusb"
+SRCNAME = "pyusb"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
diff --git a/packages/python/python-sip_4.7.bb b/packages/python/python-sip_4.7.bb
index 2978edd54f..61fcc32986 100644
--- a/packages/python/python-sip_4.7.bb
+++ b/packages/python/python-sip_4.7.bb
@@ -30,7 +30,7 @@ do_configure_prepend() {
 }
 
 do_stage() {
-	install -d ${STAGING_DIR}/${BUILD_SYS}/lib/${PYTHON_DIR}/site-packages/
+	install -d ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/
 	# sipconfig.py sipdistutils.py
 	install -m 0644 sip.h ${STAGING_INCDIR}/sip.h
 }
diff --git a/packages/python/python24-native_2.4.0.bb b/packages/python/python24-native_2.4.0.bb
index 5e948965ad..15b2b4c0fe 100644
--- a/packages/python/python24-native_2.4.0.bb
+++ b/packages/python/python24-native_2.4.0.bb
@@ -16,8 +16,8 @@ S = "${WORKDIR}/Python-2.4"
 
 inherit autotools native
 
-prefix = "${STAGING_DIR}/${BUILD_SYS}"
-exec_prefix = "${STAGING_DIR}/${BUILD_SYS}"
+prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
+exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 
 EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \
                 --without-cxx --with-signal-module --with-wctype-functions"
@@ -30,6 +30,6 @@ do_configure() {
 
 do_stage_append() {
 	# install pgen for later usage with non-native builds
-	install Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/
+	install Parser/pgen ${STAGING_BINDIR_NATIVE}/
 }