Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

77 files changed, 23919 insertions, 597 deletions

diff --git a/recipes/angstrom/angstrom-led-config.bb b/recipes/angstrom/angstrom-led-config.bb
index 464979b39c..2dbfd01952 100644
--- a/recipes/angstrom/angstrom-led-config.bb
+++ b/recipes/angstrom/angstrom-led-config.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Configuration files for runtime LED configuration" 
 
 #PV = "${DISTRO_VERSION}"
-PR = "r5"
+PR = "r6"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit update-rc.d
diff --git a/recipes/angstrom/angstrom-led-config/omap3-pandora/leds b/recipes/angstrom/angstrom-led-config/omap3-pandora/leds
new file mode 100644
index 0000000000..7d20e14c27
--- /dev/null
+++ b/recipes/angstrom/angstrom-led-config/omap3-pandora/leds
@@ -0,0 +1,8 @@
+#file format: name trigger
+pandora::keypad_bl
+pandora::power default-on
+pandora::charger
+pandora::sd1 mmc0
+pandora::sd2 mmc1
+pandora::bluetooth bluetooth
+pandora::wifi wifi
\ No newline at end of file
diff --git a/recipes/aufs/aufs_cvs.bb b/recipes/aufs/aufs_cvs.bb
index 815a24fda4..6a0e952379 100644
--- a/recipes/aufs/aufs_cvs.bb
+++ b/recipes/aufs/aufs_cvs.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "Aufs is a stackable unification filesystem such as Unionfs, which
 HOMEPAGE = "http://aufs.sourceforge.net/"
 LICENSE = "GPL"
 PV = "cvs${SRCDATE}"
-PR = "r3"
 
 RSUGGESTS_${PN} = "${PN}-tools"
 
@@ -12,6 +11,8 @@ S = "${WORKDIR}/aufs"
 
 SRC_URI = "cvs://anonymous@aufs.cvs.sourceforge.net/cvsroot/aufs;module=aufs;date=${SRCDATE}"
 
+TARGET_CC_ARCH += "${LDFLAGS}"
+
 EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} -f local.mk"
 
 # We need to check the architecture and the kernel version to
@@ -42,6 +43,10 @@ do_compile_prepend() {
 	cd ${S}
 }
 
+do_compile(){
+	LDFLAGS=""
+	oe_runmake 
+}
 
 do_install() {
 	install -d ${D}/${sbindir}
@@ -52,7 +57,6 @@ do_install() {
 	install -m 0644 aufs.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/extra/
 }
 
-
 FILES_${PN} = "/lib/modules"
 PACKAGES += "${PN}-tools"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes/base-files/base-files/omap3-pandora/fstab b/recipes/base-files/base-files/omap3-pandora/fstab
new file mode 100644
index 0000000000..a4c86104e1
--- /dev/null
+++ b/recipes/base-files/base-files/omap3-pandora/fstab
@@ -0,0 +1,13 @@
+# stock fstab - you probably want to override this with a machine specific one
+
+rootfs               /                    auto       defaults,noatime      1  1
+proc                 /proc                proc       defaults              0  0
+devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
+usbfs                /proc/bus/usb        usbfs      defaults              0  0
+tmpfs                /var/volatile        tmpfs      defaults              0  0
+tmpfs                /dev/shm             tmpfs      mode=0777             0  0
+tmpfs                /media/ram           tmpfs      defaults              0  0
+
+# uncomment this if your device has a SD/MMC/Transflash slot
+#/dev/mmcblk0p1       /media/card          auto       defaults,sync,noauto  0  0
+
diff --git a/recipes/base-files/base-files/omap3-pandora/profile b/recipes/base-files/base-files/omap3-pandora/profile
new file mode 100644
index 0000000000..5797535093
--- /dev/null
+++ b/recipes/base-files/base-files/omap3-pandora/profile
@@ -0,0 +1,34 @@
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+PATH="/usr/local/bin:/usr/bin:/bin"
+EDITOR="/bin/vi"			# needed for packages like cron
+test -z "$TERM" && TERM="vt100"	# Basic terminal capab. For screen etc.
+
+if [ ! -e /etc/localtime ]; then
+	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
+				# for an explanation of how to set this to your local timezone.
+	export TZ
+fi
+
+if [ "`id -u`" -eq 0 ]; then
+   PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
+fi
+if [ "$PS1" ]; then
+# works for bash and ash (no other shells known to be in use here)
+   PS1='\u@\h:\w\$ '
+fi
+
+if [ -d /etc/profile.d ]; then
+  for i in /etc/profile.d/*.sh; do
+    if [ -r $i ]; then
+      . $i
+    fi
+  done
+  unset i
+fi
+
+export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
+
+umask 022
+
diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb
index 5e78797e2a..483aef7ecd 100644
--- a/recipes/base-files/base-files_3.0.14.bb
+++ b/recipes/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r88"
+PR = "r89"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/recipes/devicekit/devicekit-power_009.bb b/recipes/devicekit/devicekit-power_009.bb
index 58f638cbf2..0622d4aa7c 100644
--- a/recipes/devicekit/devicekit-power_009.bb
+++ b/recipes/devicekit/devicekit-power_009.bb
@@ -7,6 +7,10 @@ S = "${WORKDIR}/DeviceKit-power-${PV}"
 
 inherit autotools pkgconfig
 
+do_configure_prepend() {
+	sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am
+}	
+
 do_stage() {
         autotools_stage_all
 }
diff --git a/recipes/devicekit/devicekit_003.bb b/recipes/devicekit/devicekit_003.bb
index a57ca88675..3439290b07 100644
--- a/recipes/devicekit/devicekit_003.bb
+++ b/recipes/devicekit/devicekit_003.bb
@@ -2,13 +2,16 @@ DESCRIPTION = "DeviceKit is a simple system service that a) can enumerate device
 LICENSE = "GPLv2"
 DEPENDS = "udev dbus-glib glib-2.0"
 
+PR = "r1"
+
 SRC_URI = "http://hal.freedesktop.org/releases/DeviceKit-${PV}.tar.gz"
 S = "${WORKDIR}/DeviceKit-${PV}"
 
+do_configure_prepend() {
+	sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am
+}	
+
 inherit autotools_stage
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
 
 FILES_${PN} += "${datadir}/dbus-1/"
-
-
-
diff --git a/recipes/eglibc/eglibc_2.10.bb b/recipes/eglibc/eglibc_2.10.bb
index d15bd61268..1bd3d6e5da 100644
--- a/recipes/eglibc/eglibc_2.10.bb
+++ b/recipes/eglibc/eglibc_2.10.bb
@@ -3,11 +3,12 @@ require eglibc.inc
 DEPENDS += "gperf-native"
 FILESPATHPKG =. "eglibc-svn:"
 PV = "2.10"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 SVN_REV="9124"
 EGLIBC_BRANCH="eglibc-2_10"
 SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_10;rev=${SVN_REV};proto=svn \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
+           file://armv4t-interworking.patch;patch=1 \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
diff --git a/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb
index bc1b04133f..6b27745f65 100644
--- a/recipes/eglibc/eglibc_2.9.bb
+++ b/recipes/eglibc/eglibc_2.9.bb
@@ -3,11 +3,12 @@ require eglibc.inc
 DEPENDS += "gperf-native"
 FILESPATHPKG =. "eglibc-svn:"
 PV = "2.9"
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 SVN_REV="8690"
 EGLIBC_BRANCH="eglibc-2_9"
 SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
+	   file://armv4t-interworking.patch;patch=1 \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb
index f652c61b96..1988350e6b 100644
--- a/recipes/eglibc/eglibc_svn.bb
+++ b/recipes/eglibc/eglibc_svn.bb
@@ -9,6 +9,7 @@ PR = "${INC_PR}.1"
 EGLIBC_BRANCH="trunk"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
+	   file://armv4t-interworking.patch;patch=1 \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
diff --git a/recipes/eglibc/files/armv4t-interworking.patch b/recipes/eglibc/files/armv4t-interworking.patch
new file mode 100644
index 0000000000..55ee8565d7
--- /dev/null
+++ b/recipes/eglibc/files/armv4t-interworking.patch
@@ -0,0 +1,53 @@
+Index: libc/ports/sysdeps/arm/memcpy.S
+===================================================================
+--- libc.orig/ports/sysdeps/arm/memcpy.S	2009-09-03 16:12:00.000000000 -0700
++++ libc/ports/sysdeps/arm/memcpy.S	2009-10-28 12:51:22.000000000 -0700
+@@ -130,7 +130,12 @@ ENTRY(memcpy)
+ 		strcsb	r4, [r0], #1
+ 		strcsb	ip, [r0]
+ 
++#if defined (__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
++		ldmfd	sp!, {r0, r4, lr}
++                bx      lr
++#else
+ 		ldmfd	sp!, {r0, r4, pc}
++#endif
+ 
+ 9:		rsb	ip, ip, #4
+ 		cmp	ip, #2
+Index: libc/ports/sysdeps/arm/memmove.S
+===================================================================
+--- libc.orig/ports/sysdeps/arm/memmove.S	2009-09-03 16:12:00.000000000 -0700
++++ libc/ports/sysdeps/arm/memmove.S	2009-10-28 12:51:22.000000000 -0700
+@@ -144,7 +144,12 @@ ENTRY(memmove)
+ 		strneb	r3, [r0, #-1]!
+ 		strcsb	r4, [r0, #-1]!
+ 		strcsb	ip, [r0, #-1]
++#if defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__)
++		ldmfd	sp!, {r0, r4, lr}
++                bx      lr
++#else
+ 		ldmfd	sp!, {r0, r4, pc}
++#endif
+ 
+ 9:		cmp	ip, #2
+ 		ldrgtb	r3, [r1, #-1]!
+Index: libc/ports/sysdeps/unix/sysv/linux/arm/clone.S
+===================================================================
+--- libc.orig/ports/sysdeps/unix/sysv/linux/arm/clone.S	2009-09-03 16:12:04.000000000 -0700
++++ libc/ports/sysdeps/unix/sysv/linux/arm/clone.S	2009-10-28 12:51:22.000000000 -0700
+@@ -96,8 +96,14 @@ ENTRY(__clone)
+ #endif
+ 	@ pick the function arg and call address off the stack and execute
+ 	ldr	r0, [sp, #4]
++#if defined(__ARM_ARCH_V4T__) && defined(__THUMB_INTERWORK__)
++	ldr 	ip, [sp], #8
++	mov	lr, pc
++        bx      ip
++#else
+ 	mov	lr, pc
+ 	ldr 	pc, [sp], #8
++#endif
+ 
+ 	@ and we are done, passing the return value through r0
+ 	b	PLTJMP(HIDDEN_JUMPTARGET(_exit))
diff --git a/recipes/fbset/fbset-modes.bb b/recipes/fbset/fbset-modes.bb
index 403751c90a..0f57609ab7 100644
--- a/recipes/fbset/fbset-modes.bb
+++ b/recipes/fbset/fbset-modes.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Default display timings and resolutions for fbset"
 PV = "0.1.0"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://fb.modes"
 
diff --git a/recipes/fbset/fbset-modes/omap3-pandora/fb.modes b/recipes/fbset/fbset-modes/omap3-pandora/fb.modes
new file mode 100644
index 0000000000..0c87401b5f
--- /dev/null
+++ b/recipes/fbset/fbset-modes/omap3-pandora/fb.modes
@@ -0,0 +1,6 @@
+mode "800x480-65"
+    # D: 36.001 MHz, H: 34.124 kHz, V: 64.998 Hz
+    geometry 800 480 800 480 16
+    timings 27777 40 214 10 34 1 1
+    rgba 5/11,6/5,5/0,0/0
+endmode
diff --git a/recipes/gnome/gedit-plugins_2.28.0.bb b/recipes/gnome/gedit-plugins_2.28.0.bb
new file mode 100644
index 0000000000..e3d7bfcac7
--- /dev/null
+++ b/recipes/gnome/gedit-plugins_2.28.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "GNOME editor plugins"
+SECTION = "x11/gnome"
+LICENSE = "GPL"
+
+DEPENDS = "gedit"
+
+inherit gnome pkgconfig
+
+FILES_${PN} += " \
+                ${libdir}/gedit-2/plugins \
+                ${datadir}/gedit-2/plugins \
+               "
+
+FILES_${PN}-dbg += " \
+                ${libdir}/gedit-2/plugins/.debug \
+               "
+
diff --git a/recipes/gnome/gnome-python_2.26.1.bb b/recipes/gnome/gnome-python_2.26.1.bb
index 1027437b7a..54523f898f 100644
--- a/recipes/gnome/gnome-python_2.26.1.bb
+++ b/recipes/gnome/gnome-python_2.26.1.bb
@@ -3,13 +3,18 @@ LICENSE = "LGPL"
 DEPENDS = "libgnomeui pyorbit python-pygtk"
 RDEPENDS = "pyorbit"
 
+PR = "r1"
+
 inherit gnome distutils-base pkgconfig
 
-do_configure() {
-	sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac
-	export HOST_SYS=${HOST_SYS}
-	export BUILD_SYS=${BUILD_SYS}
-	autotools_do_configure
+
+do_configure_prepend() {
+    export HOST_SYS=${HOST_SYS}
+    export BUILD_SYS=${BUILD_SYS}
+    sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g  \
+           -e s:'`$PKG_CONFIG --variable=defsdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \
+           -e s:'`$PKG_CONFIG --variable=argtypesdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/argtypes/\":g \
+           ${S}/configure.ac
 }
 
 do_stage() {
diff --git a/recipes/gnome/gnome-python_2.28.0.bb b/recipes/gnome/gnome-python_2.28.0.bb
new file mode 100644
index 0000000000..54523f898f
--- /dev/null
+++ b/recipes/gnome/gnome-python_2.28.0.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "GNOME Python miscellaneous bindings"
+LICENSE = "LGPL"
+DEPENDS = "libgnomeui pyorbit python-pygtk"
+RDEPENDS = "pyorbit"
+
+PR = "r1"
+
+inherit gnome distutils-base pkgconfig
+
+
+do_configure_prepend() {
+    export HOST_SYS=${HOST_SYS}
+    export BUILD_SYS=${BUILD_SYS}
+    sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g  \
+           -e s:'`$PKG_CONFIG --variable=defsdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \
+           -e s:'`$PKG_CONFIG --variable=argtypesdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/argtypes/\":g \