merge of '2a9f522bb79ea664167e746c79c80fe0d104c20f'

     and 'b2448d9d2bf369b829dab2b33b95bd7d54fcf1f4'

5 files changed, 68 insertions, 4 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 5ad67f328f..877627332c 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -53,6 +53,7 @@ FEED_ARCH_ixp4xx	= "armv5te"
 FEED_ARCH_magician	= "armv5te"
 FEED_ARCH_netbook-pro	= "armv5te"
 FEED_ARCH_nokia770	= "armv5te"
+FEED_ARCH_omap5912osk   = "armv5te"
 FEED_ARCH_poodle	= "armv5te"
 FEED_ARCH_spitz		= "armv5te"
 FEED_ARCH_tosa		= "armv5te"
@@ -132,6 +133,13 @@ PREFERRED_VERSION_freetype-native = "2.2.1"
 PREFERRED_VERSION_cairo = "1.4.2"
 PREFERRED_VERSION_glib-2.0 = "2.12.11"
 
+# older gtk-webcore releases don't work on ARM/EABI
+# We need to switch to a fixed SRCDATE or release as soon as possible 
+PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}"
+PREFERRED_VERSION_osb-jscore  = "0.5.2+svn${SRCDATE}"
+PREFERRED_VERSION_osb-nrcit   = "0.5.2+svn${SRCDATE}"
+PREFERRED_VERSION_osb-nrcore  = "0.5.2+svn${SRCDATE}"
+
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index 6dd4f0d781..234c92f62a 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -23,8 +23,6 @@ DISTRO_FEATURES_lsppchd += "raid"
 DISTRO_FEATURES_lsppchg += "raid"
 DISTRO_FEATURES_lsarm += "raid"
 
-MACHINE_TASK_PROVIDER = "task-base"
-
 # This isn't actually in OE yet
 #DISTRO_EXTRA_RDEPENDS = "openlink-machine"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index a4e4c6d4ae..6605fff3e8 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -6,7 +6,6 @@ DISTRO = "angstrom"
 DISTRO_NAME = "Angstrom"
 
 TARGET_VENDOR = "-angstrom"
-MACHINE_TASK_PROVIDER = "task-base"
 
 # Can be "glibc" and "uclibc"
 ANGSTROM_MODE ?= "glibc"
diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc
index c41f993884..457aa997dd 100644
--- a/conf/distro/include/openmoko.inc
+++ b/conf/distro/include/openmoko.inc
@@ -46,7 +46,6 @@ DISTRO_FEATURES = "alsa bluetooth ext2 ipsec nfs ppp smbfs usbgadget usbhost"
 #
 # Bootstrap & Init
 #
-MACHINE_TASK_PROVIDER = "task-base"
 require conf/distro/include/sane-srcdates.inc
 
 #
diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf
new file mode 100644
index 0000000000..26bf8b94f1
--- /dev/null
+++ b/conf/distro/mamona.conf
@@ -0,0 +1,60 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Mamona 
+#@--------------------------------------------------------------------
+
+DISTRO = "mamona"
+DISTRO_NAME = Mamona""
+DISTRO_VERSION = "test-${DATE}"
+DISTRO_TYPE = "debug"
+#DISTRO_TYPE = "release"
+
+TARGET_VENDOR = "-mamona"
+
+require conf/distro/include/angstrom-glibc.inc
+
+INHERIT += " package_deb debian"
+TARGET_OS  = "linux-gnueabi"
+
+TARGET_FPU_nokia770 = "soft"
+TARGET_FPU_n800 = "hard"
+
+FEED_ARCH_nokia770	= "armv5te"
+
+# Actually n800 is armv6 but we are using armv5te because qemu does not emulate
+# armv6 yet. 
+FEED_ARCH_n800		= "armv5te"
+#FEED_ARCH_n800		= "armv6"
+
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+#NPTL stuff
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-mamona-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+
+PREFERRED_VERSION_binutils = "2.17.50.0.5"
+PREFERRED_VERSION_binutils-cross = "2.17.50.0.5"
+
+PREFERRED_VERSION_gcc = "4.1.1"
+PREFERRED_VERSION_gcc-cross = "4.1.1"
+PREFERRED_VERSION_gcc-initial-cross = "4.1.1"
+
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
+
+PREFERRED_VERSION_glibc ?= "2.5"
+
+PREFERRED_VERSION_glibc-intermediate ?= "2.5"
+
+PREFERRED_VERSION_glibc-initial ?= "2.5"
+
+require conf/distro/include/sane-srcdates.inc
+
+