merge of '4b9a0b16383fa2823e6bb13e422ef8a64dbe7c2f'

     and '762e8a2920e077c45276e50d912c9125531a98d7'

diff --cc packages/mono/mono_1.2.2.1.bb
index e0b9545,57230e8..7d7134e
--- 1/packages/mono/mono_1.2.2.1.bb
--- 2/packages/mono/mono_1.2.2.1.bb
+++ b/packages/mono/mono_1.2.2.1.bb
@@@ -1,31 -1,5 +1,17 @@@
- DESCRIPTION = "Mono Programming Language"
- SECTION = "devel/mono"
- LICENSE = "GPL LGPL X11"
+ require mono.inc
  DEPENDS = "mono-native glib-2.0"
  
 +PR = "r1"
 +
  #We only have a cpu-${arch}.h from arm, so let's mask out non-working architectures
  COMPATIBLE_HOST = "arm.*-linux"
- SRC_URI = "http://go-mono.com/sources/mono/mono-${PV}.tar.gz \
-            file://cpu-arm.h"
- 
- inherit autotools
- 
- EXTRA_OECONF = "--disable-mcs-build"
- EXTRA_OECONF_arm = "--without-tls"
- 
- do_compile_prepend() {
-         cp ${WORKDIR}/cpu-arm.h ${S}/mono/mini/
- }
- 
 +
 +do_install_append() {
 +      install -d ${D}${libdir}/mono/1.0/
 +      cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/
 +}
 +
 +PACKAGES =+ "mono-dll"
 +FILES_mono-dll = "${libdir}/mono/1.0/"
 +
 +