diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-10-17 08:56:33 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-10-17 08:56:33 +0000 |
| commit | 47e1a204cdd1c8b446183ed2a3d64ab09051dddf (patch) | |
| tree | 81b40e3cd82915d54701534e9c35569b34d21dd8 | |
| parent | ff74c74052c4aa11f68048a9619d6ba4d681ecfb (diff) | |
| parent | 7e0393879513c77065d439d7dfda91aae5fd10a8 (diff) | |
merge of '706e9716e7abeb578efbb0d1222beef485b5212d'
and 'f3dcecae6a28a4d7f2a075677715e68f66d2ac01'
| -rw-r--r-- | classes/mono.bbclass | 17 | ||||
| -rw-r--r-- | packages/gsm/libgsmd_svn.bb | 10 | ||||
| -rw-r--r-- | packages/gtk-sharp/gtk-sharp_2.10.2.bb | 4 |
3 files changed, 24 insertions, 7 deletions
diff --git a/classes/mono.bbclass b/classes/mono.bbclass index b7c5439b86..ccb16d9acc 100644 --- a/classes/mono.bbclass +++ b/classes/mono.bbclass @@ -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 diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 9aaad58ee6..0df3b743a0 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -7,15 +7,15 @@ PV = "0.1+svnr${SRCREV}" 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" diff --git a/packages/gtk-sharp/gtk-sharp_2.10.2.bb b/packages/gtk-sharp/gtk-sharp_2.10.2.bb index 87865b7aed..ddb209e15c 100644 --- a/packages/gtk-sharp/gtk-sharp_2.10.2.bb +++ b/packages/gtk-sharp/gtk-sharp_2.10.2.bb @@ -1,9 +1,9 @@ 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 \ |