[oe-commits] org.oe.dev merge of 'a84c8b1ac7e3ca6f6ac526d280e86ab5460818ca'

[oe commit]

merge of 'a84c8b1ac7e3ca6f6ac526d280e86ab5460818ca'
     and 'eb0ba139c0c43e2c9ccd77ef5f9aa0fa4b9bab6f'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: f3dcecae6a28a4d7f2a075677715e68f66d2ac01
ViewMTN: http://monotone.openembedded.org/revision/info/f3dcecae6a28a4d7f2a075677715e68f66d2ac01
Files:
1
classes/mono.bbclass
packages/gtk-sharp/gtk-sharp_2.10.2.bb
packages/gsm/libgsmd_svn.bb
Diffs:

#
# mt diff -ra84c8b1ac7e3ca6f6ac526d280e86ab5460818ca -rf3dcecae6a28a4d7f2a075677715e68f66d2ac01
#
# 
# 
# patch "classes/mono.bbclass"
#  from [5c5c200cdd97288cce70bcf2ed91d5a60eeb0573]
#    to [5d50e08d7aafe36c91db4fc56497a7b639ccc431]
# 
# patch "packages/gtk-sharp/gtk-sharp_2.10.2.bb"
#  from [69a1caed037823a1e14b78d4230bcf93d3413248]
#    to [f5ae2db5f193469934e89f75c1c6afd203b5b814]
# 
============================================================
--- classes/mono.bbclass	5c5c200cdd97288cce70bcf2ed91d5a60eeb0573
+++ classes/mono.bbclass	5d50e08d7aafe36c91db4fc56497a7b639ccc431
@@ -140,6 +140,23 @@ python mono_do_clilibs() {
 			fd.close()
 }
 
+do_mono_stage() {
+        if [ "${INHIBIT_MONO_STAGE}" = "1" ]
+        then
+                return
+        fi
+	
+	for package in ${PACKAGES}; do
+		if [ -d  "${PKGDEST}/${package}/${libdir}" ]; then
+			cd "${PKGDEST}/${package}/${libdir}"
+			for file in `find . -iname "*.dll"`; do
+				cp --parent -fpPR "${file}" "${STAGING_LIBDIR}/"
+			done
+		fi
+	done
+}
+addtask mono_stage after do_package before do_populate_staging
+
 def mono_after_parse(d):
 	import bb
 	# Insert mono_do_clilibs into PACKAGEFUNCS
============================================================
--- packages/gtk-sharp/gtk-sharp_2.10.2.bb	69a1caed037823a1e14b78d4230bcf93d3413248
+++ packages/gtk-sharp/gtk-sharp_2.10.2.bb	f5ae2db5f193469934e89f75c1c6afd203b5b814
@@ -1,9 +1,9 @@ PV = "2.10.2"
 PV = "2.10.2"
-PR = "r0"
+PR = "r1"
 SDIRVER = "210"
 SEXT = "bz2"
 
-inherit mono
+inherit mono pkgconfig
 require gtk-sharp.inc
 
 FILES_libgtk2.0-cil = "/usr/lib/libgtksharpglue-2.so \


#
# mt diff -reb0ba139c0c43e2c9ccd77ef5f9aa0fa4b9bab6f -rf3dcecae6a28a4d7f2a075677715e68f66d2ac01
#
# 
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [e1c1d229b23ae4af4e435fafca4714fcd913c22e]
#    to [b09450bacfecfd7e16943f1725c265dfd7e78fef]
# 
============================================================
--- packages/gsm/libgsmd_svn.bb	e1c1d229b23ae4af4e435fafca4714fcd913c22e
+++ packages/gsm/libgsmd_svn.bb	b09450bacfecfd7e16943f1725c265dfd7e78fef
@@ -7,15 +7,15 @@ SRC_URI = "svn://svn.openmoko.org/trunk/
 PR = "r31"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
-           file://024_sms-text-in-bracket.patch;patch=1;minrev=2957 \
-           file://025_sms-status-report.patch;patch=1;minrev=2957 \
-           file://027_phonebook-find-and-read-range-support.patch;patch=1;minrev=2957 \
-           file://028_shell-phonebook-find-and-read-range-support.patch;patch=1;minrev=2957 \
+           file://024_sms-text-in-bracket.patch;patch=1;minrev=2957;maxrev=3199 \
+           file://025_sms-status-report.patch;patch=1;minrev=2957;maxrev=3200 \
+           file://027_phonebook-find-and-read-range-support.patch;patch=1;minrev=2957;maxrev=3202 \
+           file://028_shell-phonebook-find-and-read-range-support.patch;patch=1;minrev=2957;3203 \
            file://0001-Introduce-ports.patch;patch=1;minrev=2957 \
            file://0002-Flush-all-pending-commands-before-restarting-the-mod.patch;patch=1;minrev=2957 \
            file://0003-Correctly-segment-incoming-usock-data-into-packets.patch;patch=1;minrev=2957 \
            file://0004-Handle-read-and-write-return-values.patch;patch=1;minrev=2957 \ 
-           file://0005-Add-ask-ds-option-forSMS.patch;patch=1;minrev=2957 \ 
+           file://0005-Add-ask-ds-option-forSMS.patch;patch=1;minrev=2957;maxrev=3201 \ 
            file://lgsm_send_fix_return_value.patch;patch=1 \
            file://gsmd \
            file://default"