Merge branch 'org.openembedded.dev' of ssh+git://git@git.openembedded.net/openembedded into org.openembedded.dev

39 files changed, 7164 insertions, 198 deletions

diff --git a/recipes/abiword/abiword_2.8.3.bb b/recipes/abiword/abiword_2.8.3.bb
index 60eaa227ec..637a1284b9 100644
--- a/recipes/abiword/abiword_2.8.3.bb
+++ b/recipes/abiword/abiword_2.8.3.bb
@@ -1,7 +1,9 @@
 require abiword-2.5.inc
-DEPENDS += " libwmf-native gtkmathview "
+DEPENDS += " loudmouth libwmf-native gtkmathview "
 RCONFLICTS_${PN} = "abiword-embedded"
 
+PR = "r1"
+
 SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \
            file://autogen-common.sh \
 	   file://nodolt.patch;patch=1"
@@ -11,6 +13,7 @@ SRC_URI[abiword.sha256sum] = "b74f7ba5852e6225dd1fb52be266eaa33149fb24210b33b5d8
 
 EXTRA_OECONF = " --disable-static  \
                  --enable-plugins \
+                 --without-gnomevfs \
                  --enable-collab-backend-xmpp \
                  --enable-collab-backend-tcp \
                  --enable-collab-backend-service \
diff --git a/recipes/beep/beep_1.2.2.bb b/recipes/beep/beep_1.2.2.bb
index e3ffdce22a..5de2669cac 100644
--- a/recipes/beep/beep_1.2.2.bb
+++ b/recipes/beep/beep_1.2.2.bb
@@ -3,18 +3,15 @@
 DESCRIPTION = "A console utility to make a beep noise"
 SECTION = "console/utils"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI  = "http://johnath.com/beep/beep-${PV}.tar.gz"
 SRC_URI += "file://linux-input.patch;patch=1"
 
 S = "${WORKDIR}/beep-${PV}"
-PACKAGES += "${PN} ${PN}-doc"
-
-inherit autotools
 
 EXTRA_OEMAKE += 'CC="${CC}"'
-EXTRA_OEMAKE += 'FLAGS="${CFLAGS}"'
+EXTRA_OEMAKE += 'FLAGS="${CFLAGS} ${LDFLAGS}"'
 
 # slugos requires beep in boot
 BINDIR = "${bindir}"
diff --git a/recipes/binutils/binutils_2.20.1.bb b/recipes/binutils/binutils_2.20.1.bb
index 4f736f4e7d..e5e7f546c0 100644
--- a/recipes/binutils/binutils_2.20.1.bb
+++ b/recipes/binutils/binutils_2.20.1.bb
@@ -1,7 +1,7 @@
 require binutils.inc
 LICENSE = "GPLv3"
 
-INC_PR = "r0"
+INC_PR = "r1"
 PR = "${INC_PR}.0"
 
 SRC_URI = "\
@@ -12,6 +12,7 @@ SRC_URI = "\
      file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
      file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
      file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
+     file://binutils-x86_64_i386_biarch.patch;patch=1 \
      "
 
 SRC_URI[tarball.sha256sum] = "228b84722d87e88e7fdd36869e590e649ab523a0800a7d53df906498afe6f6f8"
diff --git a/recipes/binutils/binutils_2.20.bb b/recipes/binutils/binutils_2.20.bb
index 686358234b..63186a4870 100644
--- a/recipes/binutils/binutils_2.20.bb
+++ b/recipes/binutils/binutils_2.20.bb
@@ -1,7 +1,7 @@
 require binutils.inc
 LICENSE = "GPLv3"
 
-INC_PR = "r1"
+INC_PR = "r2"
 PR = "${INC_PR}.4"
 
 SRC_URI = "\
@@ -15,6 +15,7 @@ SRC_URI = "\
      file://ld-stub-crash.patch;patch=1;pnum=0 \
      file://binutils-arm-non-empty-know.patch;patch=1 \
      file://binutils_unexport_LD_LIBRARY_PATH_for_CC_FOR_BUILD.patch;patch=1 \
+     file://binutils-x86_64_i386_biarch.patch;patch=1 \
      "
 
 # powerpc patches
diff --git a/recipes/cups/cups-1.4.3/configure.patch b/recipes/cups/cups-1.4.3/configure.patch
new file mode 100644
index 0000000000..877e8d3232
--- /dev/null
+++ b/recipes/cups/cups-1.4.3/configure.patch
@@ -0,0 +1,117 @@
+--- cups-1.4.3/configure.orig	2010-04-08 11:14:19.092296014 +0200
++++ cups-1.4.3/configure	2010-04-08 11:19:02.661417938 +0200
+@@ -10940,114 +10940,6 @@
+     		OPTIM="-fPIC $OPTIM"
+ 	fi
+ 
+-	# The -fstack-protector option is available with some versions of
+-	# GCC and adds "stack canaries" which detect when the return address
+-	# has been overwritten, preventing many types of exploit attacks.
+-	{ echo "$as_me:$LINENO: checking if GCC supports -fstack-protector" >&5
+-echo $ECHO_N "checking if GCC supports -fstack-protector... $ECHO_C" >&6; }
+-	OLDCFLAGS="$CFLAGS"
+-	CFLAGS="$CFLAGS -fstack-protector"
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  OPTIM="$OPTIM -fstack-protector"
+-		{ echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	{ echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-	CFLAGS="$OLDCFLAGS"
+-
+-	# The -pie option is available with some versions of GCC and adds
+-	# randomization of addresses, which avoids another class of exploits
+-	# that depend on a fixed address for common functions.
+-	{ echo "$as_me:$LINENO: checking if GCC supports -pie" >&5
+-echo $ECHO_N "checking if GCC supports -pie... $ECHO_C" >&6; }
+-	OLDCFLAGS="$CFLAGS"
+-	CFLAGS="$CFLAGS -pie -fPIE"
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  PIEFLAGS="-pie -fPIE"
+-		{ echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	{ echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-	CFLAGS="$OLDCFLAGS"
+-
+ 	if test "x$with_optim" = x; then
+ 		# Add useful warning options for tracking down problems...
+ 		OPTIM="-Wall -Wno-format-y2k $OPTIM"
diff --git a/recipes/cups/cups-1.4.3/skip_tools.patch b/recipes/cups/cups-1.4.3/skip_tools.patch
new file mode 100644
index 0000000000..272110146b
--- /dev/null
+++ b/recipes/cups/cups-1.4.3/skip_tools.patch
@@ -0,0 +1,51 @@
+--- cups-1.4.3/ppdc/Makefile.orig	2010-04-07 12:38:56.650327699 +0200
++++ cups-1.4.3/ppdc/Makefile	2010-04-07 12:40:05.842418876 +0200
+@@ -243,8 +243,8 @@
+ 	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
+ 		libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \
+ 		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+-	echo Generating localization strings...
+-	./genstrings >sample.c
++#	echo Generating localization strings...
++#	./genstrings >sample.c
+ 
+ 
+ #
+@@ -261,9 +261,9 @@
+ 	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
+ 		../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+ 		$(COMMONLIBS) $(LIBZ)
+-	echo Testing PPD compiler...
+-	./ppdc-static -l en,fr -I ../data foo.drv
+-	./ppdc-static -l en,fr -z -I ../data foo.drv
++#	echo Testing PPD compiler...
++#	./ppdc-static -l en,fr -I ../data foo.drv
++#	./ppdc-static -l en,fr -z -I ../data foo.drv
+ 
+ 
+ #
+@@ -291,15 +291,15 @@
+ 		$(COMMONLIBS) $(LIBZ)
+ 	echo Testing PPD importer...
+ 	$(RM) -r ppd ppd2 sample-import.drv
+-	./ppdc-static -I ../data sample.drv
+-	./ppdi-static -I ../data -o sample-import.drv ppd/*
+-	./ppdc-static -I ../data -d ppd2 sample-import.drv
+-	if diff -qr ppd ppd2; then \
+-		echo PPD import OK; \
+-	else \
+-		echo PPD import FAILED; \
+-		exit 1; \
+-	fi
++#	./ppdc-static -I ../data sample.drv
++#	./ppdi-static -I ../data -o sample-import.drv ppd/*
++#	./ppdc-static -I ../data -d ppd2 sample-import.drv
++#	if diff -qr ppd ppd2; then \
++#		echo PPD import OK; \
++#	else \
++#		echo PPD import FAILED; \
++#		exit 1; \
++#	fi
+ 
+ 
+ #
diff --git a/recipes/cups/cups-1.4.3/use_echo_only_in_init.patch b/recipes/cups/cups-1.4.3/use_echo_only_in_init.patch
new file mode 100644
index 0000000000..21ff0e535b
--- /dev/null
+++ b/recipes/cups/cups-1.4.3/use_echo_only_in_init.patch
@@ -0,0 +1,11 @@
+--- a/init/cups.sh.in.orig	2008-10-04 16:50:46.000000000 -0300
++++ b/init/cups.sh.in	2008-10-04 16:51:39.000000000 -0300
+@@ -68,7 +68,7 @@
+ 		ECHO_ERROR=:
+ 		;;
+ 
+-	Linux*)
++	DISABLELinux*)
+ 		IS_ON=/bin/true
+ 		if test -f /etc/init.d/functions; then
+ 			. /etc/init.d/functions
diff --git a/recipes/cups/cups14.inc b/recipes/cups/cups14.inc
new file mode 100644
index 0000000000..af82e5eacc
--- /dev/null
+++ b/recipes/cups/cups14.inc
@@ -0,0 +1,93 @@
+DESCRIPTION = "An Internet printing system for Unix."
+SECTION = "console/utils"
+LICENSE = "GPL LGPL"
+DEPENDS = "gnutls dbus dbus-glib zlib fakeroot-native"
+PROVIDES = "cups14"
+
+SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2;name=archive \
+	  	  "
+
+LEAD_SONAME = "libcupsdriver.so"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = " \
+                --enable-gnutls \
+		--enable-dbus \
+		--enable-browsing \
+                --disable-openssl \
+		--disable-tiff \
+		--without-php \
+		--without-perl \
+		--without-python \
+		--without-java \
+               "
+
+
+do_configure() {
+	gnu-configize
+	libtoolize --force
+	DSOFLAGS="${LDFLAGS}" oe_runconf
+}
+
+do_compile () {
+	sed -i s:STRIP:NOSTRIP: Makedefs
+	sed -i s:serial:: backend/Makefile
+
+	echo "all:"    >  man/Makefile
+	echo "libs:" >> man/Makefile
+	echo "install:" >> man/Makefile
+	echo "install-data:" >> man/Makefile
+	echo "install-exec:" >> man/Makefile
+	echo "install-headers:" >> man/Makefile
+	echo "install-libs:" >> man/Makefile
+
+	oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \
+		   "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \
+		   "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \
+		   "LIBZ=-lz -L${STAGING_LIBDIR}" \
+		   "-I."
+}
+
+fakeroot do_install () {
+	oe_runmake "DSTROOT=${D}" install
+
+   # This directory gets installed with perms 511, which makes packaging fail
+   chmod 0711 "${D}/${localstatedir}/run/cups/certs"
+}
+
+do_stage () {
+	install -d ${STAGING_INCDIR}/cups
+	install ${S}/cups/*.h ${STAGING_INCDIR}/cups/
+	install ${S}/filter/*.h ${STAGING_INCDIR}/cups/
+	oe_libinstall -C cups -so libcups ${STAGING_LIBDIR}
+	oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR}
+}
+
+python do_package_append() {
+	# Change permissions back the way they were, they probably had a reason...
+	workdir = bb.data.getVar('WORKDIR', d, 1)
+	os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir)
+}
+
+PACKAGES =+ "${PN}-lib ${PN}-libimage"
+
+FILES_${PN}-lib = "${libdir}/libcups.so.*"
+
+FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
+
+FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
+                    ${libdir}/cups/cgi-bin/.debug \
+		    ${libdir}/cups/filter/.debug \
+		    ${libdir}/cups/monitor/.debug \
+		    ${libdir}/cups/notifier/.debug \
+		    ${libdir}/cups/daemon/.debug \
+		    "
+#package the html for the webgui inside the main packages (~1MB uncompressed)
+
+FILES_${PN} += "${datadir}/doc/cups/images \
+		${datadir}/doc/cups/*html \
+		${datadir}/doc/cups/*.css \
+                ${datadir}/icons/ \
+	       "
+
diff --git a/recipes/cups/cups_1.4.3.bb b/recipes/cups/cups_1.4.3.bb
new file mode 100644
index 0000000000..b57d1c0994
--- /dev/null
+++ b/recipes/cups/cups_1.4.3.bb
@@ -0,0 +1,15 @@
+require cups14.inc
+
+SRC_URI += "file://use_echo_only_in_init.patch;patch=1 \
+		    file://skip_tools.patch;patch=1 \
+		    file://configure.patch;patch=1 \
+			"
+
+SRC_URI[archive.md5sum] = "e70b1c3f60143d7310c1d74c111a21ab"
+SRC_URI[archive.sha256sum] = "47a559b1c50192b94479ae7dab132ea0008727045d4993501cf0a6df0c64db97"
+
+PR = "r2"
+
+DEFAULT_PREFERENCE = "-1"
+
+EXTRA_OECONF += " --disable-gssapi --disable-largefile --enable-debug --disable-relro "
diff --git a/recipes/gd/gd_2.0.35+2.0.36rc1.bb b/recipes/gd/gd_2.0.35+2.0.36rc1.bb
index efba70e9d5..d1ea7f6058 100644
--- a/recipes/gd/gd_2.0.35+2.0.36rc1.bb
+++ b/recipes/gd/gd_2.0.35+2.0.36rc1.bb
@@ -1,8 +1,8 @@
 SECTION = "libs"
 LICENSE = "GD"
 DESCRIPTION = "gd is a library used to create PNG, JPEG, or WBMP images."
-DEPENDS = "libpng jpeg zlib"
-PR = "r2"
+DEPENDS = "freetype libpng jpeg zlib"
+PR = "r3"
 
 SRC_URI = "http://www.libgd.org/releases/gd-2.0.36RC1.tar.gz;name=src"
 SRC_URI[src.md5sum] = "39ac48e6d5e0012a3bd2248a0102f209"
@@ -15,7 +15,7 @@ inherit autotools binconfig gettext
 EXTRA_OECONF += " --with-zlib=${STAGING_LIBDIR}/.. \
                   --with-png=${STAGING_LIBDIR}/.. \
                   --with-jpeg=${STAGING_LIBDIR}/.. \
-                  --without-freetype \
+                  --with-freetype \
                   --without-fontconfig \
                   --without-xpm \
                   --without-x"
diff --git a/recipes/gnuplot/gnuplot_4.4.0.bb b/recipes/gnuplot/gnuplot_4.4.0.bb
new file mode 100644
index 0000000000..9e9dfae2b2
--- /dev/null
+++ b/recipes/gnuplot/gnuplot_4.4.0.bb
@@ -0,0 +1,11 @@
+require gnuplot.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz;name=archive \
+       http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
+       file://subdirs.patch;patch=1 \
+	   file://gnuplot.desktop \
+	   file://gnuplot.png"
+
+SRC_URI[archive.md5sum] = "e708665bd512153ad5c35252fe499059"
+SRC_URI[archive.sha256sum] = "00de2c54a05920a5d2dc68f668990b0b84a96105d92a932d91600dd53f156b2a"
+
diff --git a/recipes/gtk-engines/elementary-gtk-theme_1.0.bb b/recipes/gtk-engines/elementary-gtk-theme_1.0.bb
new file mode 100644
index 0000000000..bf6424e736
--- /dev/null
+++ b/recipes/gtk-engines/elementary-gtk-theme_1.0.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "The official elementary GTK theme designed to be smooth, attractive, fast, and usable."
+LICENSE = "GPLv2"
+
+PR = "r1"
+
+SRC_URI = "http://launchpadlibrarian.net/37260169/eGTK.tar.gz;name=archive"
+
+SRC_URI[archive.md5sum] = "86e26e6408ffc0cdd366d22fb5fb7618"
+SRC_URI[archive.sha256sum] = "e7abc91270f56c71c68bfb4786eb69ca5b9148d01bb85c7b2103a3d7b8aac5a1"
+
+S = "${WORKDIR}/eGTK"
+
+do_install() {
+	rm -rf ${S}/patches
+	install -d ${D}${datadir}/themes/elementary
+	cp -r ${S}/* ${D}${datadir}/themes/elementary/
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir}"
+RDEPENDS_${PN} = "elementary-icon-theme gtk-engine-murrine gtk-engine-aurora"
+
diff --git a/recipes/gtk-engines/elementary-icon-theme-enable.bb b/recipes/gtk-engines/elementary-icon-theme-enable.bb
new file mode 100644
index 0000000000..abe6afdf19
--- /dev/null
+++ b/recipes/gtk-engines/elementary-icon-theme-enable.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Enable elementary-icon-theme in gtkrc"
+
+RDEPENDS_${PN} = "elementary-icon-theme"
+
+ALLOW_EMPTY_${PN} = "1"
+PACKAGE_ARCH = "all"
+
+pkg_postinst() {
+#!/bin/sh
+mkdir -p $D${sysconfdir}/gtk-2.0
+touch $D${sysconfdir}/gtk-2.0/gtkrc
+sed -i /gtk-icon-theme-name/d $D${sysconfdir}/gtk-2.0/gtkrc
+echo 'gtk-icon-theme-name = "elementary"' >> $D${sysconfdir}/gtk-2.0/gtkrc
+}
diff --git a/recipes/gtk-engines/elementary-icon-theme_2.3.bb b/recipes/gtk-engines/elementary-icon-theme_2.3.bb
new file mode 100644
index 0000000000..5fdb345980
--- /dev/null
+++ b/recipes/gtk-engines/elementary-icon-theme_2.3.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Icon theme from the Elementary project"
+SECTION = "x11/icons"
+HOMEPAGE = "http://www.elementary-project.com/"
+
+inherit gtk-icon-cache
+
+# We have to get the icons from a mirror (LaunchPad) as DeviantArt has a download 
+# wrapper to stop simple HTTP gets :(.
+
+SRC_URI = " \
+  http://launchpad.net/elementaryicons/2.0/2.3/+download/elementary-monochrome.tar.gz;name=mono \
+  http://launchpad.net/elementaryicons/2.0/2.3/+download/elementary.tar.gz;name=regular \
+"
+
+SRC_URI[mono.md5sum] = "986a2475e9953450b37912d154bb325d"
+SRC_URI[mono.sha256sum] = "da461bd70b2fda633f26aa7495e1efc5d97815661799566f0a8accaea411272f"
+
+SRC_URI[regular.md5sum] = "674a88984f55170c17298863f72dd34d"
+SRC_URI[regular.sha256sum] = "f7cacfd0e4d3c9ea1c84b29a4f2c75fa1066d6c7f9b41ca0b96ae033c23992a6"
+
+S = "${WORKDIR}"
+
+do_install() {
+	install -d ${D}${datadir}/icons/elementary/
+	install -d ${D}${datadir}/icons/elementary-monochrome/
+
+	cp -r ${S}/elementary/* ${D}${datadir}/icons/elementary/
+	cp -r ${S}/elementary-monochrome/* ${D}${datadir}/icons/elementary-monochrome/
+}
+
+FILES_${PN} = "${datadir}/icons/elementary*"
+RDEPENDS_${PN} += "gnome-icon-theme"
+PACKAGE_ARCH = "all"
+
diff --git a/recipes/gtk-engines/gtk-engine-aurora_1.5.1.bb b/recipes/gtk-engines/gtk-engine-aurora_1.5.1.bb
new file mode 100644
index 0000000000..bbe90f8059
--- /dev/null
+++ b/recipes/gtk-engines/gtk-engine-aurora_1.5.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "GTK aurora engine"
+LICENSE = "GPLv2"
+SECTION = "x11/base"
+DEPENDS = "gtk+ cairo"
+
+inherit gnome
+
+SRC_URI = "http://gnome-look.org/CONTENT/content-files/56438-aurora-1.5.1.tar.bz2;name=archive"
+
+SRC_URI[archive.md5sum] = "5eeea57c5938306ad7ccfc7cd71d009d"
+SRC_URI[archive.sha256sum] = "b5853809a83579591644a7bac060bc17ca1fcaa573a530f6cfa312a2073ef9f8"
+
+S = "${WORKDIR}/aurora-1.5"
+
+do_configure_prepend() {
+	tar zxvf ${WORKDIR}/aurora-gtk-engine-1.5.tar.gz -C ${WORKDIR}
+}
+
+FILES_${PN} += "${datadir}/gtk-engines ${libdir}/gtk-2.0/*/engines/*.so"
diff --git a/recipes/gtk-engines/gtk-engines_2.20.0.bb b/recipes/gtk-engines/gtk-engines_2.20.0.bb
new file mode 100644
index 0000000000..5424ce5e91
--- /dev/null
+++ b/recipes/gtk-engines/gtk-engines_2.20.0.bb
@@ -0,0 +1,35 @@
+LICENSE = "GPL"
+SECTION = "x11/base"
+DESCRIPTION = "GTK theme engines"
+DEPENDS = "gtk+ cairo"
+
+inherit gnome gtk-binver
+
+SRC_URI[archive.md5sum] = "c55d7932ba2ebfeedfb19cd4652b5c75"
+SRC_URI[archive.sha256sum] = "69b2e6798cfdcf7366b025b8f59fc63f658474f823d185473e94f969bae8cad1"
+
+PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
+
+RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
+RDEPENDS_gtk-theme-metal = "gtk-engine-metal"
+RDEPENDS_gtk-theme-mist = "gtk-engine-mist"
+RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine"
+RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue"
+RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice"
+RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial"
+RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks"
+
+RREPLACES_gtk-theme-clearlooks = "gpe-theme-clearlooks"
+
+python populate_packages_prepend() {
+	import os.path
+
+	engines_ver = ['gtk-2.0/', gtkbinver_find(d), '/engines']
+
+	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), ''.join(engines_ver))
+	themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes")
+
+	do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
+	do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')
+}
+
diff --git a/recipes/gtk-engines/murrine_0.90.3.bb b/recipes/gtk-engines/murrine_0.90.3.bb
new file mode 100644
index 0000000000..53dbf631f8
--- /dev/null
+++ b/recipes/gtk-engines/murrine_0.90.3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "GTK murrine"
+LICENSE = "GPLv2"
+SECTION = "x11/base"
+DEPENDS = "gtk+ cairo"
+
+inherit gnome gtk-binver
+
+SRC_URI[archive.md5sum] = "58a10b5c7b5e114a8a7ff5705fe274f5"
+SRC_URI[archive.sha256sum] = "c61ff7614e68b705560612ea7485454d1a7947422ac8cfe11d75e45370e2f0ba"
+
+PACKAGES =+ "gtk-engine-murrine"
+FILES_gtk-engine-murrine += "${datadir}/gtk-engines ${libdir}/gtk-2.0/*/engines/*.so"
diff --git a/recipes/gtk-engines/murrine_git.bb b/recipes/gtk-engines/murrine_git.bb
new file mode 100644
index 0000000000..a9177845ba
--- /dev/null
+++ b/recipes/gtk-engines/murrine_git.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "GTK murrine"
+LICENSE = "GPLv2"
+SECTION = "x11/base"
+DEPENDS = "gtk+ cairo"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gnome gtk-binver
+
+SRCREV = "6fd2709050cda6c14d290a9635e0bb08a804e177"
+PV = "0.91.0"
+PR_append = "+gitr${SRCREV}"
+
+
+SRC_URI = "git://git.gnome.org/murrine;protocol=git"
+S = "${WORKDIR}/git"
+
+PACKAGES =+ "gtk-engine-murrine"
+FILES_gtk-engine-murrine += "${datadir}/gtk-engines ${libdir}/gtk-2.0/*/engines/*.so"
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/akita/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/akita/defconfig
index a9bcc7bd94..3d64d89557 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/akita/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/akita/defconfig
@@ -1,13 +1,14 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.33-rc6
-# Tue Feb  9 22:56:42 2010
+# Linux kernel version: 2.6.34-rc3
+# Thu Apr  8 00:56:38 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_HAVE_PROC_CPU=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -19,6 +20,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_MTD_XIP=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_VECTORS_BASE=0xffff0000
@@ -40,11 +42,9 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_SWAP is not set
+# CONFIG_SYSVIPC is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
 
 #
 # RCU Subsystem
@@ -58,7 +58,6 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_GROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
@@ -95,16 +94,19 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
 
 #
 # Kernel Performance Events And Counters
 #
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_SLUB_DEBUG is not set
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
+# CONFIG_SLUB is not set
+CONFIG_SLOB=y
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_KPROBES=y
@@ -174,6 +176,7