[oe-commits] org.oe.dev merge of '628180938514d90c01db3867703717734d7d5d30'

[oe commit]

merge of '628180938514d90c01db3867703717734d7d5d30'
     and '6392b041c5ea8ff7227964369df13245ce5d50bf'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 706f1474ece6a6a01e4446a03863512f82c3f4a7
ViewMTN: http://monotone.openembedded.org/revision/info/706f1474ece6a6a01e4446a03863512f82c3f4a7
Files:
1
classes/setuptools.bbclass
classes/distutils.bbclass
packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
packages/openmoko2/libmokogsmd2_svn.bb
Diffs:

#
# mt diff -r628180938514d90c01db3867703717734d7d5d30 -r706f1474ece6a6a01e4446a03863512f82c3f4a7
#
# 
# 
# add_file "classes/setuptools.bbclass"
#  content [f0a6d602e9af754216e3616efb17302d0116fe3b]
# 
# patch "classes/distutils.bbclass"
#  from [09ebff44a5c1e71a442d953d3616f2d4f8c4eaaa]
#    to [41980eec92cf67538cc2af843af8a2424a084a31]
# 
============================================================
--- classes/setuptools.bbclass	f0a6d602e9af754216e3616efb17302d0116fe3b
+++ classes/setuptools.bbclass	f0a6d602e9af754216e3616efb17302d0116fe3b
@@ -0,0 +1,8 @@
+inherit distutils
+
+DEPENDS += "python-setuptools"
+
+DISTUTILS_INSTALL_ARGS = "--root=${D} \
+    --single-version-externally-managed \
+    --prefix=${prefix} \
+    --install-data=${datadir}"
============================================================
--- classes/distutils.bbclass	09ebff44a5c1e71a442d953d3616f2d4f8c4eaaa
+++ classes/distutils.bbclass	41980eec92cf67538cc2af843af8a2424a084a31
@@ -1,5 +1,11 @@ inherit distutils-base
 inherit distutils-base
 
+DISTUTILS_STAGE_HEADERS_ARGS ?= "--install-dir=${STAGING_INCDIR}/${PYTHON_DIR}"
+DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${layout_prefix} \
+    --install-data=${STAGING_DATADIR}"
+DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
+    --install-data=${D}/${datadir}"
+
 distutils_do_compile() {
          BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
          ${STAGING_BINDIR_NATIVE}/python setup.py build || \
@@ -8,7 +14,7 @@ distutils_stage_headers() {
 
 distutils_stage_headers() {
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR_NATIVE}/python setup.py install_headers --install-dir=${STAGING_INCDIR}/${PYTHON_DIR} || \
+        ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
         oefatal "python setup.py install_headers execution failed."
 }
 
@@ -16,7 +22,7 @@ distutils_stage_all() {
         install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages
         PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_DIR_HOST}${layout_prefix} --install-data=${STAGING_DATADIR} || \
+        ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
         oefatal "python setup.py install (stage) execution failed."
 }
 
@@ -24,7 +30,7 @@ distutils_do_install() {
         install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
         PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \
+        ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \
         oefatal "python setup.py install execution failed."
 
         for i in `find ${D} -name "*.py"` ; do \


#
# mt diff -r6392b041c5ea8ff7227964369df13245ce5d50bf -r706f1474ece6a6a01e4446a03863512f82c3f4a7
#
# 
# 
# patch "packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb"
#  from [f60ec286158f9d8da9bd433b8b9341f694325bee]
#    to [41a6fc6eda060eb641f0a9ae235b35370d6eb755]
# 
# patch "packages/openmoko2/libmokogsmd2_svn.bb"
#  from [37257745643dc337dbe76f5c6b0c8c55883fa32b]
#    to [de4e0686206340e87564ed3907a7ca3aac170cef]
# 
============================================================
--- packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb	f60ec286158f9d8da9bd433b8b9341f694325bee
+++ packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb	41a6fc6eda060eb641f0a9ae235b35370d6eb755
@@ -1,6 +1,6 @@ PV = "0.1.0+svn${SVNREV}"
 DESCRIPTION = "Shows the GSM / GPRS status in the OpenMoko panel"
 DEPENDS = "libgsmd libnotify"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko-panel-plugin
============================================================
--- packages/openmoko2/libmokogsmd2_svn.bb	37257745643dc337dbe76f5c6b0c8c55883fa32b
+++ packages/openmoko2/libmokogsmd2_svn.bb	de4e0686206340e87564ed3907a7ca3aac170cef
@@ -1,7 +1,7 @@ PV = "0.1.0+svnr${SRCREV}"
 SECTION = "openmoko/libs"
 DEPENDS = "libgsmd glib-2.0"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2