mono 2.2: update from preview 3 to RC1, add EABI patch

This changeset renames recipes to better reflect mono versioning.
Note, the previous mono 2.2 recipe was mis-named
rc2 and was actually preview 2.  If you built the
misnamed 2.2.0-rc2 package, it will take precedence
over the new recipe and you must manually remove
ipks in the tmp dir before building the 2.2-rc1
version.

10 files changed, 20 insertions, 7 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 361c5aa3cc..b6e7b9b40f 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -14518,9 +14518,9 @@ sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f
 md5=6610c3b999d791553a9dc21059ca9d35
 sha256=990af2fa20ad4e99ae5000df1afdb2e3b70400ba22d62e8917123d6a9d966397
 
-[http://bec-systems.com/pub/mono/mono-2.2-rc2.tar.bz2]
-md5=a311545a0003f1a599297d57e4e27916
-sha256=4cf6094f64f3446e83b968cbee3f0ed5d579b635644dd8cbd51bbbe184446600
+[http://bec-systems.com/pub/mono/mono-2.2-rc1.tar.bz2]
+md5=6dfc8364f6e761d558f134a707bae421
+sha256=44fc0eddf56c0abe861190051fceec6e223122c5835967459c69fbf98ee52067
 
 [http://venge.net/monotone/downloads/monotone-0.20.tar.gz]
 md5=3bdf4da35ff576a401483815952f4045
diff --git a/packages/mono/README b/packages/mono/README
index a262faa41c..b80b5bbbe6 100644
--- a/packages/mono/README
+++ b/packages/mono/README
@@ -1,10 +1,10 @@
 Notes on Mono support in OE.
 
 ===============================
-Mono 2.2 rc2 status
-- builds OK -- having a strange issue with a recent kernel:
-  http://thread.gmane.org/gmane.comp.gnome.mono.devel/29990
+Mono 2.2 rc1 status
 - still needs quite a bit of packaging TLC
+- applied patch for "need OABI" issue
+- overall seems to be running well
 
 ===============================
 Mono 1.9.1 status
diff --git a/packages/mono/mono-1.9.1+2.2.0-rc2/configure.patch b/packages/mono/mono-1.9.1+2.2-rc1/configure.patch
index 689f7be5da..689f7be5da 100644
--- a/packages/mono/mono-1.9.1+2.2.0-rc2/configure.patch
+++ b/packages/mono/mono-1.9.1+2.2-rc1/configure.patch
diff --git a/packages/mono/mono-1.9.1+2.2.0-rc2/disable-docs.patch b/packages/mono/mono-1.9.1+2.2-rc1/disable-docs.patch
index 2c1812e1a5..2c1812e1a5 100644
--- a/packages/mono/mono-1.9.1+2.2.0-rc2/disable-docs.patch
+++ b/packages/mono/mono-1.9.1+2.2-rc1/disable-docs.patch
diff --git a/packages/mono/mono-1.9.1+2.2.0-rc2/disable-monoburg.patch b/packages/mono/mono-1.9.1+2.2-rc1/disable-monoburg.patch
index 14a2a094a7..14a2a094a7 100644
--- a/packages/mono/mono-1.9.1+2.2.0-rc2/disable-monoburg.patch
+++ b/packages/mono/mono-1.9.1+2.2-rc1/disable-monoburg.patch
diff --git a/packages/mono/mono-1.9.1+2.2-rc1/fix-eabi-syscall.patch b/packages/mono/mono-1.9.1+2.2-rc1/fix-eabi-syscall.patch
new file mode 100644
index 0000000000..b752a8bd14
--- /dev/null
+++ b/packages/mono/mono-1.9.1+2.2-rc1/fix-eabi-syscall.patch
@@ -0,0 +1,12 @@
+--- mono.orig/mono/mini/mini-arm.c	2008/12/12 19:49:41	121457
++++ mono/mono/mini/mini-arm.c	2009/01/05 08:58:47	122416
+@@ -581,6 +581,8 @@
+ {
+ #if __APPLE__
+ 	sys_icache_invalidate (code, size);
++#elif ((__GNUC__ >= 4) && (__GNUC_MINOR__ >= 1))
++	__clear_cache (code, code + size);
+ #else
+ 	__asm __volatile ("mov r0, %0\n"
+ 			"mov r1, %1\n"
+
diff --git a/packages/mono/mono-mcs-intermediate_1.9.1+2.2.0-rc2.bb b/packages/mono/mono-mcs-intermediate_1.9.1+2.2-rc1.bb
index aa833262c3..aa833262c3 100644
--- a/packages/mono/mono-mcs-intermediate_1.9.1+2.2.0-rc2.bb
+++ b/packages/mono/mono-mcs-intermediate_1.9.1+2.2-rc1.bb
diff --git a/packages/mono/mono-native_1.9.1+2.2.0-rc2.bb b/packages/mono/mono-native_1.9.1+2.2-rc1.bb
index a6b0f3f5ae..a6b0f3f5ae 100644
--- a/packages/mono/mono-native_1.9.1+2.2.0-rc2.bb
+++ b/packages/mono/mono-native_1.9.1+2.2-rc1.bb
diff --git a/packages/mono/mono_1.9.1+2.2.0-rc2.bb b/packages/mono/mono_1.9.1+2.2-rc1.bb
index 03970b131d..866624d0b5 100644
--- a/packages/mono/mono_1.9.1+2.2.0-rc2.bb
+++ b/packages/mono/mono_1.9.1+2.2-rc1.bb
@@ -12,6 +12,7 @@ ARM_INSTRUCTION_SET = "arm"
 SRC_URI += "file://configure.patch;patch=1 \
             file://disable-docs.patch;patch=1 \
             file://disable-monoburg.patch;patch=1 \
+            file://fix-eabi-syscall.patch;patch=1 \
 	   "
 
 # Per http://www.mono-project.com/Mono:ARM
diff --git a/packages/mono/mono_2.2.0.inc b/packages/mono/mono_2.2.0.inc
index af268402a2..eb22b1bfb6 100644
--- a/packages/mono/mono_2.2.0.inc
+++ b/packages/mono/mono_2.2.0.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Mono Programming Language"
 SECTION = "devel/mono"
 LICENSE = "GPL LGPL X11"
 
-SRC_URI = "http://bec-systems.com/pub/mono/mono-2.2-rc2.tar.bz2 \
+SRC_URI = "http://bec-systems.com/pub/mono/mono-2.2-rc1.tar.bz2 \
 		"
 
 #	   file://mono-libgc-configure.patch;patch=1"