[oe-commits] org.oe.dev merge of '81d8dc81a1a7a826e84a23750afa2f81bb4c8787'

[rpurdie commit]

merge of '81d8dc81a1a7a826e84a23750afa2f81bb4c8787'
     and 'f3ce42d6e8e15e51ce97fef93a3948da8fedc3ad'

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 77fcc376ce406668f13d7aa04a11f78c7879d878
ViewMTN: http://monotone.openembedded.org/revision/info/77fcc376ce406668f13d7aa04a11f78c7879d878
Files:
1
classes/distutils-base.bbclass
packages/images/moko-underground-image.bb
packages/python/python-dbus_0.82.4.bb
classes/sip.bbclass
classes/sip3.bbclass
Diffs:

#
# mt diff -r81d8dc81a1a7a826e84a23750afa2f81bb4c8787 -r77fcc376ce406668f13d7aa04a11f78c7879d878
#
# 
# 
# patch "classes/distutils-base.bbclass"
#  from [0a204cd849e070a15c2f9ff46443eda8e28915d0]
#    to [94522dc614b8c3295309161e3fbdff50dff557a7]
# 
# patch "packages/images/moko-underground-image.bb"
#  from [1bf3dccf2e43b6f0f8f36ad6c5e4d6115b40e826]
#    to [e3d712c4f1771ae91a8a413966252fb17a92eee9]
# 
# patch "packages/python/python-dbus_0.82.4.bb"
#  from [0b72f74fcfa2cc0079dab2bfdcb2fac470905f05]
#    to [aff2c48f361a7ace67a1057330cf36a822c07811]
# 
============================================================
--- classes/distutils-base.bbclass	0a204cd849e070a15c2f9ff46443eda8e28915d0
+++ classes/distutils-base.bbclass	94522dc614b8c3295309161e3fbdff50dff557a7
@@ -11,8 +11,17 @@ PYTHON_DIR = "${@python_dir(d)}"
 	raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
 
 PYTHON_DIR = "${@python_dir(d)}"
+
+PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc ${PN}"
+
 FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
-FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/.debug \
-                   ${libdir}/${PYTHON_DIR}/site-packages/*/.debug \
-                   ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug"
 
+FILES_${PN}-dev += "\
+  ${libdir}/pkgconfig \
+  ${libdir}/${PYTHON_DIR}/site-packages/*.la \
+"
+FILES_${PN}-dbg = "\
+  ${libdir}/${PYTHON_DIR}/site-packages/.debug \
+  ${libdir}/${PYTHON_DIR}/site-packages/*/.debug \
+  ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug \
+"
============================================================
--- packages/images/moko-underground-image.bb	1bf3dccf2e43b6f0f8f36ad6c5e4d6115b40e826
+++ packages/images/moko-underground-image.bb	e3d712c4f1771ae91a8a413966252fb17a92eee9
@@ -24,7 +24,11 @@ IMAGE_INSTALL = "\
   xhost \
   xset \
   xrandr \
-  "
+  \
+  gsm0710muxd \
+  pyneod \
+  pyneog \
+"
 
 DEPENDS = "\
   ${MACHINE_TASK_PROVIDER} \
============================================================
--- packages/python/python-dbus_0.82.4.bb	0b72f74fcfa2cc0079dab2bfdcb2fac470905f05
+++ packages/python/python-dbus_0.82.4.bb	aff2c48f361a7ace67a1057330cf36a822c07811
@@ -1,10 +1,10 @@ RDEPENDS = "python-threading python-io p
 DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
 SECTION = "devel/python"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "MIT"
 DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
 RDEPENDS = "python-threading python-io python-stringold python-logging"
-PR = "ml1"
+PR = "ml2"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
 S = "${WORKDIR}/dbus-python-${PV}"
@@ -18,3 +18,4 @@ do_stage() {
 	autotools_stage_all
 }
 
+FILES_${PN}-dev += "${libdir}/pkgconfig 


#
# mt diff -rf3ce42d6e8e15e51ce97fef93a3948da8fedc3ad -r77fcc376ce406668f13d7aa04a11f78c7879d878
#
# 
# 
# patch "classes/sip.bbclass"
#  from [19431964e31ac4c591edad007b98e47bc3efc3b7]
#    to [be6a303b7d4f75f2848b8a9ddf442eb07abe01ad]
# 
# patch "classes/sip3.bbclass"
#  from [73a1199d0cd0e38e5322e0047631d476afeb1f4b]
#    to [84dab383d7482a72c8bba8b75e317b6d2c68f7c8]
# 
============================================================
--- classes/sip.bbclass	19431964e31ac4c591edad007b98e47bc3efc3b7
+++ classes/sip.bbclass	be6a303b7d4f75f2848b8a9ddf442eb07abe01ad
@@ -55,6 +55,8 @@ sip_do_generate() {
 	done
 }
 
+do_generate[deptask] = "do_populate_staging"
+
 EXPORT_FUNCTIONS do_generate
 
 addtask generate after do_unpack do_patch before do_configure
============================================================
--- classes/sip3.bbclass	73a1199d0cd0e38e5322e0047631d476afeb1f4b
+++ classes/sip3.bbclass	84dab383d7482a72c8bba8b75e317b6d2c68f7c8
@@ -53,6 +53,8 @@ sip3_do_generate() {
 	done
 }
 
+do_generate[deptask] = "do_populate_staging"
+
 EXPORT_FUNCTIONS do_generate
 
 addtask generate after do_unpack do_patch before do_configure