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

96 files changed, 1325 insertions, 366 deletions

diff --git a/recipes/barebox/barebox.inc b/recipes/barebox/barebox.inc
new file mode 100644
index 0000000000..b3def2a7b6
--- /dev/null
+++ b/recipes/barebox/barebox.inc
@@ -0,0 +1,49 @@
+DESCRIPTION = "Barebox - a bootloader that inherits the best of U-Boot and the Linux kernel"
+HOMEPAGE = "http://www.barebox.org/"
+SECTION = "bootloaders"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PROVIDES = "virtual/bootloader"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit kernel-arch
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+
+BAREBOX_MACHINE ?= "${MACHINE}_defconfig"
+BAREBOX_BINARY ?= "barebox.bin"
+BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PV}-${PR}.bin"
+BAREBOX_SYMLINK ?= "barebox-${MACHINE}.bin"
+
+INSANE_SKIP_${PN} = True
+
+do_configure_prepend() {
+	   cp ${WORKDIR}/defconfig ${S}/.config
+	   oe_runmake oldconfig
+}
+
+do_compile () {
+	   unset LDFLAGS
+	   unset CFLAGS
+	   unset CPPFLAGS
+	   oe_runmake all
+}
+
+do_deploy () {
+	  install -d ${DEPLOY_DIR_IMAGE}
+	  install ${S}/${BAREBOX_BINARY} ${DEPLOY_DIR_IMAGE}/${BAREBOX_IMAGE}
+	  package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${BAREBOX_IMAGE}
+
+	  cd ${DEPLOY_DIR_IMAGE}
+	  rm -f ${BAREBOX_SYMLINK}
+	  ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK}
+	  package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${BAREBOX_SYMLINK}
+}
+do_deploy[dirs] = "${S}"
+addtask deploy before do_build after do_compile
+
+do_stage() {
+	   install -d ${STAGING_BINDIR_NATIVE}
+	   install -m 755 scripts/mkimage ${STAGING_BINDIR_NATIVE}/
+}
diff --git a/recipes/barebox/barebox_2009.12.bb b/recipes/barebox/barebox_2009.12.bb
new file mode 100644
index 0000000000..2977429180
--- /dev/null
+++ b/recipes/barebox/barebox_2009.12.bb
@@ -0,0 +1,15 @@
+require barebox.inc
+
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+BAREBOX_REVISION ?= "0"
+
+S = "${WORKDIR}/barebox-${PV}.${BAREBOX_REVISION}"
+
+SRC_URI = "http://barebox.org/download/barebox-${PV}.${BAREBOX_REVISION}.tar.bz2;name=barebox-${PV}.${BAREBOX_REVISION} \
+	   file://defconfig"
+
+SRC_URI[barebox-2009.12.0.md5sum] = "d1aefe17cfd72affec766617b42dfb78"
+SRC_URI[barebox-2009.12.0.sha256sum] = "0ccd59898289652f4bebd8282737a771729d84886195221c781df08f81a837ef"
diff --git a/recipes/barebox/barebox_git.bb b/recipes/barebox/barebox_git.bb
new file mode 100644
index 0000000000..8f9e3221d7
--- /dev/null
+++ b/recipes/barebox/barebox_git.bb
@@ -0,0 +1,10 @@
+require barebox.inc
+
+PR = "r0"
+
+FILESPATHPKG =. "barebox-git:"
+
+SRC_URI = "git://git.pengutronix.de/git/barebox.git;protocol=git \
+	   file://defconfig"
+
+S = "${WORKDIR}/git"
diff --git a/recipes/binutils/binutils_2.17.bb b/recipes/binutils/binutils_2.17.bb
index fdee8a56ec..ceea7c6d26 100644
--- a/recipes/binutils/binutils_2.17.bb
+++ b/recipes/binutils/binutils_2.17.bb
@@ -1,7 +1,8 @@
 require binutils.inc
 require binutils-avr32.inc
 
-PR = "r7"
+INC_PR = "r7"
+PR = "${INC_PR}.1"
 
 SRC_URI = \
     "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
diff --git a/recipes/cairo/cairo-native_1.8.0.bb b/recipes/cairo/cairo-native_1.8.0.bb
index c575cdcce1..d58e16b61d 100644
--- a/recipes/cairo/cairo-native_1.8.0.bb
+++ b/recipes/cairo/cairo-native_1.8.0.bb
@@ -3,8 +3,7 @@ require cairo_1.8.0.bb
 
 inherit native
 
-DEPENDS += "glib-2.0-native libpng-native libpixman-native libx11-native fontconfig-native"
+DEPENDS += "glib-2.0-native libpng-native pixman-native libx11-native fontconfig-native"
 PROVIDES = "cairo-native"
 
-PR = "r0"
-
+PR = "r1"
diff --git a/recipes/dri/libdrm_2.4.17.bb b/recipes/dri/libdrm_2.4.17.bb
new file mode 100644
index 0000000000..fd1ab3a5e4
--- /dev/null
+++ b/recipes/dri/libdrm_2.4.17.bb
@@ -0,0 +1,18 @@
+SECTION = "x11/base"
+DEPENDS = "libpthread-stubs"
+LICENSE = "MIT"
+SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
+PROVIDES = "drm"
+PR = "r2"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel',d)}"
+
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES =+ "${@base_contains('MACHINE_FEATURES', 'x86', '${PN}-intel', '',d)}"
+
+FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
diff --git a/recipes/eggdbus/eggdbus_0.6.bb b/recipes/eggdbus/eggdbus_0.6.bb
new file mode 100644
index 0000000000..1d8717929b
--- /dev/null
+++ b/recipes/eggdbus/eggdbus_0.6.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "gobject dbus binding"
+HOMEPAGE = "http://cgit.freedesktop.org/~david/eggdbus"
+LICENSE = "GPLv2"
+
+DEPENDS = "dbus glib-2.0"
+
+BASE_SRC_URI = "http://cgit.freedesktop.org/~david/${BPN}/snapshot/${BPN}-${PV}.tar.bz2 \
+          file://gtk-doc.patch;patch=1 \
+          "
+
+SRC_URI = "${BASE_SRC_URI} \
+           file://marshal.patch;patch=1 \
+          "
+
+SRC_URI_virtclass-native = "${BASE_SRC_URI}"
+
+inherit autotools
+
+EXTRA_OECONF = " --disable-man-pages --disable-gtk-doc-html "
+
+BBCLASSEXTEND = "native"
+
diff --git a/recipes/eggdbus/files/gtk-doc.patch b/recipes/eggdbus/files/gtk-doc.patch
new file mode 100644
index 0000000000..0999a85153
--- /dev/null
+++ b/recipes/eggdbus/files/gtk-doc.patch
@@ -0,0 +1,32 @@
+Index: eggdbus-0.6/docs/eggdbus/Makefile.am
+===================================================================
+--- eggdbus-0.6.orig/docs/eggdbus/Makefile.am
++++ eggdbus-0.6/docs/eggdbus/Makefile.am
+@@ -87,11 +87,7 @@ HTML_IMAGES = 				\
+ # Extra options to supply to gtkdoc-fixref
+ FIXXREF_OPTIONS=
+ 
+-if ENABLE_GTK_DOC
+-include $(top_srcdir)/gtk-doc.make
+-else
+ CLEANFILES =
+-endif
+ 
+ CLEANFILES +=   *~				\
+ 		eggdbus-scan.*			\
+Index: eggdbus-0.6/docs/tests/Makefile.am
+===================================================================
+--- eggdbus-0.6.orig/docs/tests/Makefile.am
++++ eggdbus-0.6/docs/tests/Makefile.am
+@@ -65,11 +65,7 @@ HTML_IMAGES = 				\
+ # Extra options to supply to gtkdoc-fixref
+ FIXXREF_OPTIONS=
+ 
+-if ENABLE_GTK_DOC
+-include $(top_srcdir)/gtk-doc.make
+-else
+ CLEANFILES =
+-endif
+ 
+ CLEANFILES +=   *~				\
+ 		tests-scan.*			\
diff --git a/recipes/eggdbus/files/marshal.patch b/recipes/eggdbus/files/marshal.patch
new file mode 100644
index 0000000000..2b2cb4985b
--- /dev/null
+++ b/recipes/eggdbus/files/marshal.patch
@@ -0,0 +1,26 @@
+Index: eggdbus-0.6/src/eggdbus/Makefile.am
+===================================================================
+--- eggdbus-0.6.orig/src/eggdbus/Makefile.am
++++ eggdbus-0.6/src/eggdbus/Makefile.am
+@@ -130,7 +130,7 @@ BUILT_SOURCES =								\
+ 	$(NULL)
+ 
+ eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal
+-	EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool							\
++	EGG_DBUS_GENMARSHAL=eggdbus-glib-genmarshal eggdbus-binding-tool							\
+ 		--namespace EggDBus									\
+ 		--dbus-namespace org.freedesktop.DBus							\
+ 		--interfaces-only									\
+Index: eggdbus-0.6/src/tests/Makefile.am
+===================================================================
+--- eggdbus-0.6.orig/src/tests/Makefile.am
++++ eggdbus-0.6/src/tests/Makefile.am
+@@ -25,7 +25,7 @@ BUILT_SOURCES = 							\
+ 	$(NULL)
+ 
+ t