merge of '7f726014d804dac37f882d802eea690ed0c00cee'

     and 'de1ed6b33382c6e5abd3af8087cf833ca9a9c78b'

78 files changed, 153964 insertions, 25 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 046b107936..43e45bd87d 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -460,9 +460,10 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 # when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything.
 #
 # This works for  functions as well, they are really just environment variables.
-#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
-# Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon
+# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
 OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+# Alternative OVERRIDES definition without "fail fast", usually only for native building and Scratchbox toolchains.
+#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}"
 
 ##################################################################
 # Include the rest of the config files.
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 00fa645c5e..1f2961f3a1 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -71,7 +71,7 @@ PREFERRED_VERSION_freetype-native  = "2.2.1"
 PREFERRED_VERSION_cairo            = "1.4.10"
 PREFERRED_VERSION_glib-2.0         = "2.12.12"
 PREFERRED_VERSION_pango            = "1.16.4"
-PREFERRED_VERSION_atk              = "1.10.3"
+PREFERRED_VERSION_atk              = "1.20.0"
 PREFERRED_VERSION_gtk+             = "2.10.14"
 
 # newer poppler cvs breaks some apps, fix until popper 6 and apps
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 6695dd0d97..d557c77e9a 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -7,9 +7,12 @@ SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
 SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
+SRCREV_pn-neod ?= "${AUTOREV}"
 
 SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
+SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
+SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-common ?= "${AUTOREV}"
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index d51df961a1..89ab0e0687 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
 PV = "0.1.0"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = " \
   file://asoundrc \
@@ -41,7 +41,7 @@ PACKAGES += "alsa-states"
 FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asoundrc"
 FILES_alsa-states = "${sysconfdir}/*.state"
 PACKAGE_ARCH_${PN} = "all"
-PACKAGE_ARCH_alsa-states = "${MACHINE}"
+PACKAGE_ARCH_alsa-states = "${MACHINE_ARCH}"
 
 pkg_postinst_${PN}() {
 	if test -z "$D"
diff --git a/packages/fbset/fbset-modes.bb b/packages/fbset/fbset-modes.bb
index 1daa0e8f57..2724252125 100644
--- a/packages/fbset/fbset-modes.bb
+++ b/packages/fbset/fbset-modes.bb
@@ -1,18 +1,14 @@
 DESCRIPTION = "Default display timings and resolutions for fbset"
 PV = "0.1.0"
-PR = "r0"
+PR = "r2"
 
-ALLOW_EMPTY = "1"
-
-SRC_URI_append_fic-gta01 = " \
-    file://fb.modes"
+SRC_URI = "file://fb.modes"
 
 do_install() {
     install -d ${D}${sysconfdir}
     install -m 0644 ${WORKDIR}/fb.modes ${D}${sysconfdir}
 }
 
-FILES_${PN} = "${sysconfdir}/fb.modes"
-PACKAGE_ARCH_${PN} = "all"
-PACKAGE_ARCH_fbset-modes = "${MACHINE}"
+PACKAGE_ARCH = "all"
+CONFFILES_${PN} = "${sysconfdir}/fb.modes"
 
diff --git a/packages/fbset/fbset-modes/fb.modes b/packages/fbset/fbset-modes/fb.modes
new file mode 100644
index 0000000000..ba5e6ed719
--- /dev/null
+++ b/packages/fbset/fbset-modes/fb.modes
@@ -0,0 +1,3 @@
+# By default there is nothing in this file just a reminder to define some
+# modes in OE
+
diff --git a/packages/grdesktop/.mtn2git_empty b/packages/grdesktop/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/grdesktop/.mtn2git_empty
diff --git a/packages/grdesktop/grdesktop-0.23/.mtn2git_empty b/packages/grdesktop/grdesktop-0.23/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/grdesktop/grdesktop-0.23/.mtn2git_empty
diff --git a/packages/grdesktop/grdesktop-0.23/fr.po.patch b/packages/grdesktop/grdesktop-0.23/fr.po.patch
new file mode 100644
index 0000000000..bd36d46ae6
--- /dev/null
+++ b/packages/grdesktop/grdesktop-0.23/fr.po.patch
@@ -0,0 +1,11 @@
+--- /po/orig-fr.po	2004-03-04 13:22:07.000000000 +0200
++++ /po/fr.po	2007-10-23 11:56:53.000000000 +0300
+@@ -12,7 +12,7 @@
+ "PO-Revision-Date: 2002-11-13 16:30+0200\n"
+ "Last-Translator: Jean-Francois Kubitowicz <jean-francois.kubitowicz@laposte."
+ "net>\n"
+-"Language-Team: LANGUAGE <LL@li.org>\n"
++"Language-Team: French <LL@li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
diff --git a/packages/grdesktop/grdesktop-0.23/install-help.patch b/packages/grdesktop/grdesktop-0.23/install-help.patch
new file mode 100644
index 0000000000..8aac6f8afc
--- /dev/null
+++ b/packages/grdesktop/grdesktop-0.23/install-help.patch
@@ -0,0 +1,11 @@
+--- /help/C/orig-Makefile.am	2004-03-30 16:56:57.000000000 +0300
++++ /help/C/Makefile.am	2007-10-23 12:22:10.000000000 +0300
+@@ -40,7 +40,7 @@
+ install-data-hook-omf:
+ 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+ 	for file in $(extraomf); do \
+-		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		$(INSTALL_DATA) $$file $(DESTDIR)$(omf_dest_dir)/$$file; \
+ 	done
+ 	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+ 
diff --git a/packages/grdesktop/grdesktop_0.23.bb b/packages/grdesktop/grdesktop_0.23.bb
new file mode 100644
index 0000000000..a87e9fbeac
--- /dev/null
+++ b/packages/grdesktop/grdesktop_0.23.bb
@@ -0,0 +1,21 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+DESCRIPTION = "grdesktop is a GNOME frontend, for the remote desktop client (rdesktop)."
+HOMEPAGE = "http://www.nongnu.org/grdesktop/index.html"
+SECTION = "x11/utils"
+LICENSE = "GPLv2"
+
+DEPENDS = "gtk+ libgnomeui"
+RDEPENDS ="rdesktop"
+
+PR = "r0"
+
+SRC_URI = "http://download.savannah.nongnu.org/releases/grdesktop/grdesktop-${PV}.tar.gz \
+           file://fr.po.patch;patch=1 \
+           file://install-help.patch;patch=1"
+      
+
+S = "${WORKDIR}/grdesktop-${PV}"
+
+inherit autotools pkgconfig
+
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/.mtn2git_empty b/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/.mtn2git_empty
diff --git a/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/arm_pxa_20070923.patch b/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/arm_pxa_20070923.patch
new file mode 100644
index 0000000000..ad4ce996df
--- /dev/null
+++ b/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/arm_pxa_20070923.patch
@@ -0,0 +1,5877 @@
+# Base git commit: da8f153e51290e7438ba7da66234a864e5d3e1c1
+#	(Revert "x86_64: Quicklist support for x86_64")
+#
+# Author:    eric miao (Wed Sep 12 03:13:17 BST 2007)
+# Committer: Russell King (Sun Sep 23 14:18:19 BST 2007)
+#   
+#   [ARM] pxa: PXA3xx base support
+#   
+#   Signed-off-by: eric miao
+#   Signed-off-by: Russell King
+#
+# arch/arm/Kconfig                         |    6 
+# arch/arm/boot/compressed/head-xscale.S   |    4 
+# arch/arm/mach-pxa/Kconfig                |   30 +
+# arch/arm/mach-pxa/Makefile               |    9 
+# arch/arm/mach-pxa/clock.c                |   79 ++--
+# arch/arm/mach-pxa/clock.h                |   43 ++
+# arch/arm/mach-pxa/devices.h              |    3 
+# arch/arm/mach-pxa/generic.c              |  146 ++++---
+# arch/arm/mach-pxa/generic.h              |   26 +
+# arch/arm/mach-pxa/irq.c                  |   80 ----
+# arch/arm/mach-pxa/mfp.c                  |  235 ++++++++++++
+# arch/arm/mach-pxa/pxa25x.c               |   90 ++++
+# arch/arm/mach-pxa/pxa27x.c               |  127 ++++++
+# arch/arm/mach-pxa/pxa300.c               |   93 +++++
+# arch/arm/mach-pxa/pxa320.c               |   88 ++++
+# arch/arm/mach-pxa/pxa3xx.c               |  216 +++++++++++
+# arch/arm/mach-pxa/time.c                 |   53 ++
+# arch/arm/mach-pxa/zylonite.c             |  184 +++++++++
+# arch/arm/mach-pxa/zylonite_pxa300.c      |  188 ++++++++++
+# arch/arm/mach-pxa/zylonite_pxa320.c      |  173 +++++++++
+# arch/arm/mm/Kconfig                      |    4 
+# drivers/i2c/busses/i2c-pxa.c             |   45 +-
+# drivers/input/keyboard/pxa27x_keyboard.c |   25 +
+# drivers/mmc/host/pxamci.c                |   43 +-
+# drivers/mmc/host/pxamci.h                |   14 
+# drivers/mtd/maps/lubbock-flash.c         |    9 
+# drivers/mtd/maps/mainstone-flash.c       |    5 
+# drivers/net/irda/pxaficp_ir.c            |   51 ++
+# drivers/net/smc91x.c                     |   62 ---
+# drivers/net/smc91x.h                     |   71 +++
+# drivers/serial/pxa.c                     |  163 ++++----
+# drivers/serial/serial_core.c             |   18 
+# drivers/usb/gadget/pxa2xx_udc.c          |   68 ++-
+# drivers/usb/gadget/pxa2xx_udc.h          |    1 
+# drivers/video/pxafb.c                    |   36 +
+# drivers/video/pxafb.h                    |    1 
+# include/asm-arm/arch-pxa/hardware.h      |   72 +++
+# include/asm-arm/arch-pxa/irqs.h          |    6 
+# include/asm-arm/arch-pxa/mfp-pxa300.h    |  574 ++++++++++++++++++++++++++++++
+# include/asm-arm/arch-pxa/mfp-pxa320.h    |  446 ++++++++++++++++++++++++
+# include/asm-arm/arch-pxa/mfp.h           |  576 +++++++++++++++++++++++++++++++
+# include/asm-arm/arch-pxa/pxa-regs.h      |    2 
+# include/asm-arm/arch-pxa/pxa3xx-regs.h   |   75 ++++
+# include/asm-arm/arch-pxa/timex.h         |    2 
+# include/asm-arm/arch-pxa/zylonite.h      |   35 +
+# 45 files changed, 3825 insertions(+), 452 deletions(-)
+#    create mode 100644 arch/arm/mach-pxa/mfp.c
+#    create mode 100644 arch/arm/mach-pxa/pxa300.c
+#    create mode 100644 arch/arm/mach-pxa/pxa320.c
+#    create mode 100644 arch/arm/mach-pxa/pxa3xx.c
+#    create mode 100644 arch/arm/mach-pxa/zylonite.c
+#    create mode 100644 arch/arm/mach-pxa/zylonite_pxa300.c
+#    create mode 100644 arch/arm/mach-pxa/zylonite_pxa320.c
+#    create mode 100644 include/asm-arm/arch-pxa/mfp-pxa300.h
+#    create mode 100644 include/asm-arm/arch-pxa/mfp-pxa320.h
+#    create mode 100644 include/asm-arm/arch-pxa/mfp.h
+#    create mode 100644 include/asm-arm/arch-pxa/pxa3xx-regs.h
+#    create mode 100644 include/asm-arm/arch-pxa/zylonite.h
+#
+# Author:    Russell King (Sat Sep  1 21:27:18 BST 2007)
+# Committer: Russell King (Sun Sep 23 14:18:17 BST 2007)
+#   
+#   [NET] smc91x: fix PXA DMA support code
+#   
+#   The PXA DMA support code for smc91x doesn't pass a struct device to
+#   the dma_*map_single() functions, which leads to an oops in the dma
+#   bounce code.  We have a struct device which was used to probe the
+#   SMC chip.  Use it.
+#   
+#   (This patch is slightly larger because it requires struct smc_local
+#   to move into the header file.)
+#   
+#   Signed-off-by: Russell King
+#
+#
+# Author:    Russell King (Sat Sep  1 21:25:09 BST 2007)
+# Committer: Russell King (Sun Sep 23 14:18:12 BST 2007)
+#   
+#   [SERIAL] Fix console initialisation ordering
+#   
+#   Ensure pm callback is called upon initialisation to place port in
+#   correct power saving state.  Ensure console is initialised prior
+#   to deciding whether to power down the port.
+#   
+#   Signed-off-by: Russell King
+#
+#
+# Author:    Russell King (Wed Sep 19 09:21:51 BST 2007)
+# Committer: Russell King (Sun Sep 23 14:18:07 BST 2007)
+#   
+#   [ARM] pxa: tidy up arch/arm/mach-pxa/Makefile
+#   
+#   Signed-off-by: Russell King
+#
+#
+# Author:    Russell King (Sat Sep  1 21:28:55 BST 2007)
+# Committer: Russell King (Sun Sep 23 14:18:03 BST 2007)
+#   
+#   [ARM] lubbock, mainstone: only initialise if running on that platform
+#   
+#   Signed-off-by: Russell King
+#
+#
+# Author:    eric miao (Wed Aug 29 10:22:17 BST 2007)
+# Committer: Russell King (Sun Sep 23 14:18:01 BST 2007)
+#   
+#   [ARM] 4560/1: pxa: move processor specific set_wake logic out of irq.c
+#   
+#   a function pxa_init_irq_set_wake() was introduced, so that
+#   processor specific code could install their own version
+#   
+#   code setting PFER and PRER registers within pxa_gpio_irq_type
+#   are removed, and the edge configuration is postponed to the
+#   (*set_wake) and copies the GRER and GFER register, which will
+#   always be set up correctly by pxa_gpio_irq_type()
+#   
+#   Signed-off-by: eric miao
+#   Signed-off-by: Russell King
+#
+#
+# Author:    eric miao (Wed Aug 29 10:18:47 BST 2007)
+# Committer: Russell King (Sun Sep 23 14:17:59 BST 2007)