Merge commit 'openembedded.org/org.openembedded.dev' into org.openembedded.dev

2 files changed, 27 insertions, 5 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index cb6340a172..98da2835c4 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -86,6 +86,8 @@ SRCREV_pn-linux-openmoko-devel ?= "04f54c7001fb609e11ff4b2b4575c04188dbefef"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
+SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04"
+SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9"
 SRCREV_pn-matchbox-desktop-2 ?= "1778"
 SRCREV_pn-matchbox-keyboard ?= "1910"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
@@ -169,6 +171,10 @@ SRCREV_pn-python-gsmd = "148"
 SRCREV_pn-python-lightmediascanner = "68"
 SRCREV_pn-python-pyrtc = "d1f32060474767582dd4248d5e5c2adc63931d5a"
 SRCREV_pn-python-pyyaml = "294"
+QEMUSRCREV = "4242"
+SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
+SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
+SRCREV_pn-qemu ?= "${QEMUSRCREV}"
 SRCREV_pn-remoko = "115"
 SRCREV_pn-remoko-server = "115"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf
index 264a064521..83e102663c 100644
--- a/conf/distro/mamona.conf
+++ b/conf/distro/mamona.conf
@@ -16,6 +16,7 @@ require conf/distro/include/sane-srcrevs.inc
 
 INHERIT += "angstrom-mirrors mamona-mirrors"
 INHERIT += "package_deb debian"
+INHERIT += "buildallpkgs"
 
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
@@ -26,17 +27,17 @@ KERNEL = "kernel26"
 MACHINE_KERNEL_VERSION = "2.6"
 PREFERRED_VERSION_linux-omap1 ?= "2.6.22-omap1"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.22"
-PREFERRED_VERSION_linux = "2.6.16"
+PREFERRED_VERSION_linux ?= "2.6.22"
 PREFERRED_VERSION_linux-libc-headers_nokia770 = "2.6.16.osso7"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 
 # Toolchain
 # =========
 
 # gcc
-PREFERRED_PROVIDERS_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
-PREFERRED_PROVIDERS_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
-PREFERRED_PROVIDERS_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
-PREFERRED_PROVIDERS_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
 
 PREFERRED_VERSION_gcc ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross ?= "4.1.2"
@@ -45,6 +46,7 @@ PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross-intermediate ?= "4.1.2"
 
 # binutils
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_VERSION_binutils ?= "2.18"
 PREFERRED_VERSION_binutils-cross ?= "2.18"
 PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
@@ -57,6 +59,7 @@ PREFERRED_PROVIDER_virtual/libc = "glibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
 
 PREFERRED_VERSION_glibc ?= "2.5"
+PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 PREFERRED_VERSION_glibc-initial ?= "2.5"
 PREFERRED_VERSION_uclibc ?= "0.9.29"
 
@@ -75,6 +78,7 @@ PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-dpkg"
 PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
 PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
 PREFERRED_PROVIDER_virtual/db ?= "db"
 PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
 PREFERRED_PROVIDER_avahi = "avahi"
@@ -83,3 +87,15 @@ PREFERRED_PROVIDER_gconf = "gconf-dbus"
 PREFERRED_VERSION_apt = "0.7.6"
 PREFERRED_VERSION_gpsd ?= "2.33"
 PREFERRED_VERSION_hal_nokia770 = "0.5.7"
+PREFERRED_VERSION_networkmanager ?= "0.6.6"
+
+# Mplayer
+PREFERRED_VERSION_mplayer_nokia770 ?= "1.0maemo0"
+PREFERRED_VERSION_mplayer_nokia800 ?= "1.0maemo0"
+
+# Network
+PREFERRED_VERSION_wpa-supplicant = "0.5.7"
+
+# Mozilla
+PREFERRED_PROVIDER_gtk+ = "gtk+"
+PREFERRED_VERSION_gtk+ = "2.10.14"