merge of '04adb86ea3ad9a36bf1b34f2f54604db30723c92'

     and '59b29b63107f2448a7c5cb337360ab2aff6624e3'

6 files changed, 72 insertions, 29 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 86e87f31d6..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"
@@ -96,9 +97,6 @@ PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh6"
 PREFERRED_VERSION_file = "4.18"
 PREFERRED_VERSION_file_native = "4.18"
 
-SRCDATE_gconf-dbus = "20060719"
-SRCDATE_gnome-vfs-dbus = "20060803"
-
 CVS_TARBALL_STASH = "\
 		     http://www.angstrom-distribution.org/unstable/sources/ \
 		     http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
@@ -130,11 +128,18 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
 
 PREFERRED_VERSION_fontconfig = "2.4.1"
-PREFERRED_VERSION_freetype = "2.3.1"
+PREFERRED_VERSION_freetype = "2.3.3"
 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/debianslug.conf b/conf/distro/debianslug.conf
deleted file mode 100644
index 59123fd6b5..0000000000
--- a/conf/distro/debianslug.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#@TYPE: Distribution
-#@NAME: DebianSlug
-#@DESCRIPTION: DebianSlug Linux Distribution for the NSLU2
-
-DISTRO_NAME = "DebianSlug"
-IMAGE_BASENAME = "debianslug"
-TARGET_ARCH = "arm"
-ARM_INSTRUCTION_SET = "arm"
-TARGET_OS = "linux"
-
-require conf/distro/slugos.conf
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index fdac29e398..9fd71d05d8 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -46,7 +46,7 @@ SRCDATE_rosetta ?= "20060804"
 SRCDATE_gpesyncd ?= "20061128"
 
 # GNOME
-SRCDATE_gconf-dbus ?= "20060719"
+SRCDATE_gconf-dbus ?= "20070412"
 SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
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
+
+
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
deleted file mode 100644
index f03c4f653e..0000000000
--- a/conf/distro/openslug.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#@TYPE: Distribution
-#@NAME: OpenSlug
-#@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
-
-DISTRO_NAME = "OpenSlug"
-IMAGE_BASENAME = "openslug"
-TARGET_ARCH = "armeb"
-ARM_INSTRUCTION_SET = "arm"
-TARGET_OS = "linux"
-
-require conf/distro/slugos.conf
diff --git a/conf/distro/openslug-native.conf b/conf/distro/slugos-native.conf
index ac77532697..77258c7148 100644
--- a/conf/distro/openslug-native.conf
+++ b/conf/distro/slugos-native.conf
@@ -1,9 +1,9 @@
 # Our build host is armeb, not armv5eb that the kernel reports
 BUILD_ARCH = "armeb"
 
-require conf/distro/openslug.conf
+require conf/distro/slugos.conf
 
-# Corresponding packages should be in openslug-native.bb,
+# Corresponding packages should be in slugos-native.bb,
 # currently missing: ipkg-utils libtool quilt pkgconfig
 ASSUME_PROVIDED = "libtool-cross \
 		   libtool-native \