merge of '838a60f4684a5fe71ade31d05fb35609808420d1'

     and 'caed6636e646bb9b999bfe3a3234c92da9e20252'

6 files changed, 35 insertions, 20 deletions

diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 3292631c43..5206d26cdd 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -1,3 +1,8 @@
+SRCREV_pn-libgsmd ?= "${AUTOREV}"
+SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
+SRCREV_pn-libmokojournal2 ?= "${AUTOREV}"
+SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
+SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 387a4e068e..c16385da7f 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -15,9 +15,10 @@ SRCREV_pn-ezxd ?= "2052"
 SRCREV_pn-elf2flt="1786"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-fstests ?= "204"
+SRCREV_pn-gconf-dbus ?= "606"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-hildon-1 ?= "13708"
-SRCREV_pn-libgsmd ?= "2806"
+SRCREV_pn-libgsmd ?= "2957"
 SRCREV_pn-libmokogsmd2 ?= "2950"
 SRCREV_pn-libmokojournal2 ?= "2780"
 SRCREV_pn-libmokopanelui2 ?= "2958"
diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
index 77312791dc..29af29a3b8 100644
--- a/conf/machine/alix.conf
+++ b/conf/machine/alix.conf
@@ -5,9 +5,9 @@
 # http://pcengines.ch/alix1c.htm
 
 # i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
-TARGET_ARCH = "i686"
+TARGET_ARCH = "i586"
 
-PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 geode"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
@@ -17,6 +17,8 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi"
 
+require conf/machine/include/tune-geodelx.conf
+
 IMAGE_FSTYPES += "tar.gz"
 
 MACHINE_EXTRA_RRECOMMENDS = "\
diff --git a/conf/machine/include/tune-geodelx.conf b/conf/machine/include/tune-geodelx.conf
new file mode 100644
index 0000000000..335fadec6e
--- /dev/null
+++ b/conf/machine/include/tune-geodelx.conf
@@ -0,0 +1,6 @@
+# Geode CPU has it's own target in GCC 4.3
+# in older versions k6-2 is closest
+#
+TARGET_CC_ARCH = "-march=k6-2"
+PACKAGE_ARCH = "geode"
+
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index 3647059de1..5a5e78a207 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -1,44 +1,40 @@
 SECTION = "x11/utils"
-DEPENDS = "gtk+ glib-2.0 dbus dbus-glib libxml2 popt intltool-native"
+DEPENDS = "intltool-native glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native"
 DESCRIPTION = "Settings daemon using DBUS for communication."
 LICENSE = "GPL"
 PROVIDES = "gconf"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
-PV = "2.16.0+svn${SRCDATE}"
-PR = "r0"
+PV = "2.16.0+svnr${SRCREV}"
+PR = "r3"
 
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
 	   file://69gconfd-dbus"
 
-inherit pkgconfig autotools
+inherit pkgconfig autotools 
 S = "${WORKDIR}/trunk"
 
 PARALLEL_MAKE = ""
 
-FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so \
-                 ${libdir}/GConf-dbus/2/*.so \
-                 ${libdir}/dbus-1.0 \
-		 ${sysconfdir} \
-		 ${datadir}/dbus*"
-FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug \
-                    ${libdir}/GConf-dbus/2/.debug ""
+FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
+FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
+
+EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
 
-EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
 
 do_configure_prepend() {
-	touch ${S}/gtk-doc.make
+        touch gtk-doc.make
 }
 
 do_stage() {
-	autotools_stage_all
+        autotools_stage_all
+        install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
 }
 
 do_install_append () {
 	install -d ${D}/${sysconfdir}/X11/Xsession.d
 	install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
-	install -d ${D}/${datadir}/dbus-1.0/services/
-	install -m 644  gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
+        install -d ${D}/${datadir}/dbus-1.0/services/
+        install -m 644  gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
 }
-
diff --git a/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb b/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
index f3b7b0e6c8..51fb846ce9 100644
--- a/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
+++ b/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
@@ -5,6 +5,11 @@ S = "${WORKDIR}/gtk+-${PV}"
 FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
 SRC_URI += "file://reduce-dependencies.patch;patch=1"
 
+#clear recommends for uclibc builds
+RRECOMMENDS = " "
+RRECOMMENDS_${PN}_linux = "  "
+RRECOMMENDS_${PN}_linux-gnueabi = " "
+
 EXTRA_OECONF = "\
   --without-x \
   --with-gdktarget=linux-fb \