merge of '31f5a286594a5bbefbd62d34485ab695172c7f17'

     and 'abf691e484310ced8674e16092ab962cb2d94941'

80 files changed, 6957 insertions, 68 deletions

diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass
index 4191f4edc1..c41a3ff369 100644
--- a/classes/siteinfo.bbclass
+++ b/classes/siteinfo.bbclass
@@ -42,6 +42,8 @@ def get_siteinfo_list(d):
                "i686-linux-uclibc":       "endian-little bit-32 common-uclibc ix86-common",\
                "mipsel-linux":            "endian-little bit-32 common-glibc",\
                "mipsel-linux-uclibc":     "endian-little bit-32 common-uclibc",\
+               "mips-linux":              "endian-big bit-32 common-glibc",\
+               "mips-linux-uclibc":       "endian-big bit-32 common-uclibc",\
                "powerpc-darwin":          "endian-big bit-32 common-darwin",\
                "ppc-linux":               "endian-big bit-32 common-glibc powerpc-common",\ 
 	       "powerpc-linux":           "endian-big bit-32 common-glibc powerpc-common",\
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
new file mode 100644
index 0000000000..e8903a960a
--- /dev/null
+++ b/conf/machine/at91sam9260ek.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@Name: Atmel AT91SAM9260EK Development Platform
+#@DESCRIPTION: Machine configuration for the at91sam9260ek development board with a at91sam9260 processor
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.conf
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
new file mode 100644
index 0000000000..489575cd2b
--- /dev/null
+++ b/conf/machine/at91sam9261ek.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@Name: Atmel AT91SAM9261EK Development Platform
+#@DESCRIPTION: Machine configuration for the at91sam9261ek development board with a at91sam9261 processor
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.conf
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 2727fd44d3..0e308b0a67 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_tslib = "tslib-maemo"
 
-XSERVER = "xserver-kdrive-omap"
+XSERVER = "xserver-kdrive-xomap"
 
 # 800x480 is big enough for me
 GUI_MACHINE_CLASS = "bigscreen"
diff --git a/conf/machine/ts72xx.conf b/conf/machine/ts72xx.conf
new file mode 100644
index 0000000000..632f3044cc
--- /dev/null
+++ b/conf/machine/ts72xx.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@Name: Technologic Systems TS-72xx SBC
+#@DESCRIPTION: Machine configuration for Technologic Systems TS-72xx SBC
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen"
+
+# default is 2.6.22.6
+#PREFERRED_VERSION_linux = "2.6.23-rc5"
+
+SERIAL_CONSOLE = "115200 ttyAM0"
+USE_VT = "0"
+CMDLINE = "console=ttyAM0,115200 ip=192.168.1.3:192.168.1.2:192.168.1.2:255.255.255.0 root=/dev/nfs nfsroot=192.168.1.2:/media/data/devel/om2007.2/ts72xx/tmp/deploy/glibc/images/ts72xx/nfs_root"
+
+require conf/machine/include/tune-arm920t.inc
diff --git a/packages/fakeroot/fakeroot-native_1.7.1.bb b/packages/fakeroot/fakeroot-native_1.7.1.bb
index 6f2969e181..8b3d2a1590 100644
--- a/packages/fakeroot/fakeroot-native_1.7.1.bb
+++ b/packages/fakeroot/fakeroot-native_1.7.1.bb
@@ -3,8 +3,7 @@ require fakeroot_${PV}.bb
 inherit native
 RDEPENDS="util-linux-native"
 
-SRC_URI += "file://fix-prefix.patch;patch=1 \
-	    file://work-with-older-libtool.patch;patch=1"
+SRC_URI += "file://fix-prefix.patch;patch=1 "
 S = "${WORKDIR}/fakeroot-${PV}"
 
 EXTRA_OECONF = " --program-prefix="
diff --git a/packages/fakeroot/fakeroot_1.7.1.bb b/packages/fakeroot/fakeroot_1.7.1.bb
index 486bf93a46..803b5f3ff4 100644
--- a/packages/fakeroot/fakeroot_1.7.1.bb
+++ b/packages/fakeroot/fakeroot_1.7.1.bb
@@ -3,9 +3,10 @@ SECTION = "base"
 LICENSE = "GPL"
 # fakeroot needs getopt which is provided by the util-linux package
 RDEPENDS = "util-linux"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_${PV}.tar.gz"
+SRC_URI = "ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_${PV}.tar.gz \
+           file://work-with-older-libtool.patch;patch=1"
 
 inherit autotools
 
diff --git a/packages/glibc/eglibc-initial_svn.bb b/packages/glibc/eglibc-initial_svn.bb
index 02ba4c6273..ae3f0d2b41 100644
--- a/packages/glibc/eglibc-initial_svn.bb
+++ b/packages/glibc/eglibc-initial_svn.bb
@@ -10,6 +10,7 @@ do_configure () {
 	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
 	chmod +x ${S}/configure
 	unset CFLAGS
+	find ${S} -name "configure" | xargs touch
 	CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
 		--without-cvs --disable-sanity-checks \
 		--with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
diff --git a/packages/glibc/eglibc-intermediate_svn.bb b/packages/glibc/eglibc-intermediate_svn.bb
index c26f649031..5ecbdb6ed8 100644
--- a/packages/glibc/eglibc-intermediate_svn.bb
+++ b/packages/glibc/eglibc-intermediate_svn.bb
@@ -6,6 +6,7 @@ do_install () {
 
 # gcc uses -Werror which break on a "you have no thumb interwork" _warning_
 do_configure_prepend() {
+	find ${S} -name "configure" | xargs touch
 	sed -i s:-Werror:: ${S}/configure
 }
 
diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index b47493f4e0..0b69283681 100644
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -65,7 +65,7 @@ do_configure () {
                 exit 1
         fi
         (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
-        find ${WORKDIR} -name "configure" | xargs touch
+        find ${S} -name "configure" | xargs touch
         CPPFLAGS="" oe_runconf
 }
 
diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb
index 02beafa044..e341fd31ab 100644
--- a/packages/gnome/gnome-desktop_2.18.3.bb
+++ b/packages/gnome/gnome-desktop_2.18.3.bb
@@ -11,8 +11,6 @@ SRC_URI += "file://scrollkeeper.patch;patch=1 \
 
 EXTRA_OECONF = "--disable-scrollkeeper"
 
-EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
-
 do_configure_prepend () {
 	cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
 }
diff --git a/packages/gnome/gnome-panel_2.18.1.bb b/packages/gnome/gnome-panel_2.18.1.bb
index 349951143b..59c6f3e6e0 100644
--- a/packages/gnome/gnome-panel_2.18.1.bb
+++ b/packages/gnome/gnome-panel_2.18.1.bb
@@ -1,8 +1,9 @@
 LICENSE = "GPL"
 DEPENDS = "libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus"
 
-inherit gnome pkgconfig
+PR = "r1"
 
+inherit gnome pkgconfig
 
 do_configure_prepend() {
         sed -i -e s:help:: ${S}/Makefile.am
@@ -12,6 +13,9 @@ do_configure_prepend() {
 PACKAGES =+ "libpanel-applet"
 FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
 
+FILES_${PN} =+ "${datadir}/gnome* \
+                ${datadir}/icons"
+
 do_stage() {
         autotools_stage_all
 }
diff --git a/packages/gnome/libwnck_2.13.5.bb b/packages/gnome/libwnck_2.13.5.bb
index 1830a7540a..5ad3e00cbf 100644
--- a/packages/gnome/libwnck_2.13.5.bb
+++ b/packages/gnome/libwnck_2.13.5.bb
@@ -1,7 +1,6 @@
 LICENSE =	"LGPL"
 DEPENDS = 	"gtk+"
 DESCRIPTION =	"Window navigation construction toolkit"
-HOMEPAGE =	""
 
 inherit gnome
 
diff --git a/packages/gpephone/gpe-applauncher_0.10.bb b/packages/gpephone/gpe-applauncher_0.10.bb
new file mode 100644
index 0000000000..fbc47bd091
--- /dev/null
+++ b/packages/gpephone/gpe-applauncher_0.10.bb
@@ -0,0 +1,12 @@
+LICENSE     = "GPL"
+DESCRIPTION = "A cellphone application launcher."
+SECTION = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += '${datadir}/themes'
diff --git a/packages/gtk-webcore/midori/.mtn2git_empty b/packages/gtk-webcore/midori/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk-webcore/midori/.mtn2git_empty
diff --git a/packages/gtk-webcore/midori/midori.desktop b/packages/gtk-webcore/midori/midori.desktop
new file mode 100644
index 0000000000..683b1a343e
--- /dev/null
+++ b/packages/gtk-webcore/midori/midori.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Midori
+Comment=Webkit based browser
+Exec=midori
+Terminal=false
+Type=Application
+Categories=Application
diff --git a/packages/gtk-webcore/midori_0.0.2.bb b/packages/gtk-webcore/midori_0.0.2.bb
deleted file mode 100644
index 7f5fb6cd74..0000000000
--- a/packages/gtk-webcore/midori_0.0.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Midori is a lightweight web browser."
-LICENSE = "GPLv2"
-
-DEPENDS = "osb-jscore osb-nrcit osb-nrcore libsexy" 
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz"
-
-
-
diff --git a/packages/gtk-webcore/midori_0.0.3.bb b/packages/gtk-webcore/midori_0.0.3.bb
deleted file mode 100644
index 7f5fb6cd74..0000000000
--- a/packages/gtk-webcore/midori_0.0.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Midori is a lightweight web browser."
-LICENSE = "GPLv2"
-
-DEPENDS = "osb-jscore osb-nrcit osb-nrcore libsexy" 
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz"
-
-
-
diff --git a/packages/gtk-webcore/midori_0.0.4.bb b/packages/gtk-webcore/midori_0.0.4.bb
deleted file mode 100644
index 4f39f7bab3..0000000000
--- a/packages/gtk-webcore/midori_0.0.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Midori is a lightweight web browser."
-LICENSE = "GPLv2"
-
-DEPENDS = "webkit-gtk libsexy" 
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz"
-
-
-
diff --git a/packages/gtk-webcore/midori_0.0.5.bb b/packages/gtk-webcore/midori_0.0.5.bb
deleted file mode 100644
index 4f39f7bab3..0000000000
--- a/packages/gtk-webcore/midori_0.0.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Midori is a lightweight web browser."
-LICENSE = "GPLv2"
-
-DEPENDS = "webkit-gtk libsexy" 
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz"
-
-
-
diff --git a/packages/gtk-webcore/midori_0.0.6.bb b/packages/gtk-webcore/midori_0.0.6.bb
new file mode 100644
index 0000000000..ed0213964f
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.6.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+           file://midori.desktop"
+
+do_install_append() {
+        if  [ -f ${WORKDIR}/midori.desktop ]; then
+                install -d ${D}${datadir}/applications
+                install -m 0644 ${WORKDIR}/midori.desktop ${D}${datadir}/applications
+        fi
+
+}
+
diff --git a/packages/linux/linux-2.6.20/at91sam9260ek/.mtn2git_empty b/packages/linux/linux-2.6.20/at91sam9260ek/.mtn2git_empty
new file mode 100644
index 0000000000..e69d