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

28 files changed, 660 insertions, 307 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b8a90104b4..5d850401ea 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -6622,6 +6622,10 @@ sha256=a24640d8ca9c485d7611880193f18e5ae62af07e3b9464904f3602277f1d4097
 md5=414181781fb0923f884a38503e8e56da
 sha256=270e2e423a0b8e90091fd6f38422c488b67a23494d671764b9ed2e17ca802e16
 
+[http://pypi.python.org/packages/source/f/flup/flup-1.0.2.tar.gz]
+md5=24dad7edc5ada31dddd49456ee8d5254
+sha256=4bad317a5fc1ce3d4fe5e9b6d846ec38a8023e16876785d4f88102f2c8097dd9
+
 [http://pypi.python.org/packages/source/f/flup/flup-1.0.tar.gz]
 md5=530801fe835fd9a680457e443eb95578
 sha256=dd943b9746997bb6e49820187998dd26a58b2d0f886a45c166209e6d7d35aa32
@@ -11234,6 +11238,10 @@ sha256=f59292de39b9a4010414bd120a494226399767148efa37278bd53d9613167964
 md5=b1e814c7f5ef2a5033e4c3e5162ac694
 sha256=27b3703a0d6470e03e1574b481d6d05d652c787a793854f2f0e06d06c998a601
 
+[http://downloads.sourceforge.net/hplip/hplip-2.8.10.tar.gz]
+md5=a9ad78c4f0d884caac6b176b3cb9bf21
+sha256=8e34e2bc5974fd0f4ab71fbb42ac76fe3074fb2a09960452e4a1a157a77e00f1
+
 [http://thegraveyard.org/files/hsetroot-1.0.2.tar.gz]
 md5=f599770a6411dcfe216c37b280fad9bc
 sha256=d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7
@@ -25378,6 +25386,10 @@ sha256=ac091ba9b2e2e9aff293969b3405b145c09789e59ac0caab2247211a19e09a8a
 md5=8ffa2ff763badd5de7592004d8d69a63
 sha256=197c29803790efc0273bb4577d54629d0769a3b49b091c6430eb6704fd69824f
 
+[http://download.videolan.org/pub/videolan/vlc/1.0.2/vlc-1.0.2.tar.bz2]
+md5=69d4e30fe4fc2691780fbeacd40359d2
+sha256=38b176fd495f3254db74e03977235a0a2212fc6533d7cd1a4c3dddc495b074f0
+
 [http://www.lavrsen.dk/foswiki/pub/Motion/VideoFourLinuxLoopbackDevice/vloopback-1.2.tar.gz]
 md5=1b63bf5b3d2b7fae63497d285789aec5
 sha256=d5af0c07aa53a6c93e92a6dd83f34dd9a08a05a0c0169c8ca8b15b023fdadf80
@@ -25882,6 +25894,10 @@ sha256=fd21224ec09ca5294ba0627433e4d2cb726d389c7818d162f152374e6d693342
 md5=25fcaa86a53333d416d5e837fb47ba7d
 sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21
 
+[http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20090928-2245.tar.bz2]
+md5=99870531113dafd01026c01a96c5fcbb
+sha256=8b435c02ed0a09d039c0a89c8ddc5470e1885630a5dcedfe3d8bc60a6d63ab69
+
 [http://archive.apache.org/dist/xml/xalan-j/xalan-j_2_7_1-src.tar.gz]
 md5=fc805051f0fe505c7a4b1b5c8db9b9e3
 sha256=fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 03e5c8ec23..83cf820f9b 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -8,11 +8,11 @@ PREFERRED_VERSION_dropbear      = "0.51"
 PREFERRED_VERSION_fontconfig	= "2.6.0"
 PREFERRED_VERSION_glib-2.0 	= "2.22.0"
 PREFERRED_VERSION_glib-2.0-native = "2.22.0"
-PREFERRED_VERSION_glibmm = "2.18.0"
+PREFERRED_VERSION_glibmm = "2.22.1"
 PREFERRED_VERSION_glproto	= "1.4.9"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
 PREFERRED_VERSION_gtk+		= "2.18.0"
-PREFERRED_VERSION_gtkmm		= "2.14.1"
+PREFERRED_VERSION_gtkmm		= "2.18.1"
 PREFERRED_VERSION_hal		= "0.5.13"
 PREFERRED_VERSION_libgemwidget	= "1.0"
 PREFERRED_VERSION_libgpephone	= "0.4"
diff --git a/recipes/classpath/classpath-native.inc b/recipes/classpath/classpath-native.inc
index dba97769e7..e7570c4f98 100644
--- a/recipes/classpath/classpath-native.inc
+++ b/recipes/classpath/classpath-native.inc
@@ -34,6 +34,7 @@ EXTRA_OECONF = "\
   --enable-tools \
   --includedir=${STAGING_INCDIR}/classpath \
   --with-vm=java \
+  --enable-tool-wrappers \
   "
 
 do_stage() {
diff --git a/recipes/classpath/classpath-native_0.97.2.bb b/recipes/classpath/classpath-native_0.97.2.bb
index 0024136b97..8a2c36b5c7 100644
--- a/recipes/classpath/classpath-native_0.97.2.bb
+++ b/recipes/classpath/classpath-native_0.97.2.bb
@@ -1,6 +1,6 @@
 require classpath-native.inc
 
-PR = "r4"
+PR = "r5"
 
 # The code affected by the javanet-local patch
 # is usually not compiled. However if someone changes
diff --git a/recipes/classpath/classpath-native_0.98.bb b/recipes/classpath/classpath-native_0.98.bb
index 710958a550..9f4c8f9077 100644
--- a/recipes/classpath/classpath-native_0.98.bb
+++ b/recipes/classpath/classpath-native_0.98.bb
@@ -3,7 +3,7 @@ require classpath-native.inc
 # Deadlocks occur on at least amd64 hosts.
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r0"
+PR = "r1"
 
 # The code affected by the javanet-local patch
 # is usually not compiled. However if someone changes
diff --git a/recipes/gnome-mplayer/gnome-mplayer.inc b/recipes/gnome-mplayer/gnome-mplayer.inc
index 15808a11b4..74208c5543 100644
--- a/recipes/gnome-mplayer/gnome-mplayer.inc
+++ b/recipes/gnome-mplayer/gnome-mplayer.inc
@@ -6,6 +6,10 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ gconf dbus-glib"
 RDEPENDS = "mplayer"
 
-inherit autotools pkgconfig gconf
+inherit gnome
 
 SRC_URI = "http://gnome-mplayer.googlecode.com/files/${P}.tar.gz"
+
+FILES_${PN} += "${datadir}/icons"
+
+
diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb b/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
new file mode 100644
index 0000000000..37502adb4e
--- /dev/null
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
@@ -0,0 +1,3 @@
+require gnome-mplayer.inc
+
+PR = "r6"
diff --git a/recipes/gnome/libsoup-2.4_2.27.91.bb b/recipes/gnome/libsoup-2.4_2.27.91.bb
index ae503065c0..1fce0ff1e3 100644
--- a/recipes/gnome/libsoup-2.4_2.27.91.bb
+++ b/recipes/gnome/libsoup-2.4_2.27.91.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "An HTTP library implementation in C"
 SECTION = "x11/gnome/libs"
 LICENSE = "GPL"
-DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3"
+DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3 gnome-keyring"
+
+PR = "r1"
 
 inherit gnome
 
diff --git a/recipes/gstreamer/gst-plugin-gles/omap3_disable_depth_attachment.patch b/recipes/gstreamer/gst-plugin-gles/omap3_disable_depth_attachment.patch
new file mode 100644
index 0000000000..1b4cf15c8f
--- /dev/null
+++ b/recipes/gstreamer/gst-plugin-gles/omap3_disable_depth_attachment.patch
@@ -0,0 +1,45 @@
+--- /tmp/gstgldisplay.c	2009-09-28 00:49:48.000000000 +0530
++++ git/gst-libs/gst/gl/gstgldisplay.c	2009-09-28 02:35:00.000000000 +0530
+@@ -1252,12 +1252,12 @@ gst_gl_display_thread_init_download (Gst
+           default:
+             g_assert_not_reached ();
+         }
+-
++#if 0
+         //attach the depth render buffer to the FBO
+         glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT,
+             GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT,
+             display->download_depth_buffer);
+-
++#endif
+         gst_gl_display_check_framebuffer_status ();
+ 
+         g_assert (glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT) ==
+@@ -1555,11 +1555,11 @@ gst_gl_display_thread_gen_fbo (GstGLDisp
+   //attach the texture to the FBO to renderer to
+   glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+       GL_TEXTURE_RECTANGLE_ARB, fake_texture, 0);
+-
++#if 0
+   //attach the depth render buffer to the FBO
+   glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
+       GL_RENDERBUFFER_EXT, display->generated_depth_buffer);
+-
++#endif
+   g_assert (glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT) ==
+       GL_FRAMEBUFFER_COMPLETE_EXT);
+ 
+@@ -2443,11 +2443,11 @@ gst_gl_display_thread_init_upload_fbo (G
+     //attach the texture to the FBO to renderer to
+     glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+         GL_TEXTURE_RECTANGLE_ARB, fake_texture, 0);
+-
++#if 0
+     //attach the depth render buffer to the FBO
+     glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
+         GL_RENDERBUFFER_EXT, display->upload_depth_buffer);
+-
++#endif
+     gst_gl_display_check_framebuffer_status ();
+ 
+     g_assert (glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT) ==
diff --git a/recipes/gstreamer/gst-plugin-gles_git.bb b/recipes/gstreamer/gst-plugin-gles_git.bb
new file mode 100644
index 0000000000..68c1241191
--- /dev/null
+++ b/recipes/gstreamer/gst-plugin-gles_git.bb
@@ -0,0 +1,58 @@
+DESCRIPTION = "GStreamer OpenGL/GLES2 plugins"
+LICENSE = "LGPL"
+
+SRCREV = "18f5c4875006606b28aa9aa366abbc5dd1e16b60"
+SRCREV_common = "792d198f3f694e5475d1467b5ae9371a23baf7a3" 
+PR_append = "+gitr${SRCREV}"
+PV = "0.10"
+
+DEPENDS = "virtual/libsdl libgles-omap3 gstreamer gst-plugins-base"
+
+
+SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-plugins-gl;protocol=git \
+           http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.23.tar.bz2 \
+           file://omap3_disable_depth_attachment.patch;patch=1 \
+"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-tests --disable-examples"
+
+do_configure_prepend () {
+	cp -rf ${WORKDIR}/gstreamer-0.10.23/common/* ${S}/common/
+	cp -rf ${WORKDIR}/gstreamer-0.10.23/po/* ${S}/po/
+	sed -i -e '/po /d' ${S}/Makefile.am
+}
+
+do_configure () {
+	#Hack to force GLES2
+	acl_cv_hardcode_libdir_flag_spec= ac_cv_header_GL_gl_h=no autotools_do_configure
+
+	#Hack to disable Werror (treat warning as errors)
+	for i in $(find "${S}" -name Makefile) ; do
+		sed -i -e 's:-Wl,-rpath-link,${STAGING_LIBDIR}::g' -e s:\Werror\:\Wno-error\:g $i
+	done
+}
+
+GST_LIBV = 0.10
+
+do_install() {
+	install -d ${D}${libdir}/gstreamer-${GST_LIBV}/
+	install -m 0755 gst/gl/.libs/libgstopengl.so ${D}${libdir}/gstreamer-${GST_LIBV}
+	install -m 0755 gst-libs/gst/gl/.libs/libgstgl-0.10.so.0.0.0 ${D}${libdir}/libgstgl-0.10.so.0
+}
+
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/libgstopengl.so \
+               ${libdir}/libgstgl-0.10.so.0"
+
+FILES_${PN}-dev += "\
+  ${libdir}/gstreamer-0.10/libgstopengl.* \
+"
+
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+
+INSANE_SKIP_${PN} = True
+
diff --git a/recipes/hplip/hplip-2.8.10/cross-build.patch b/recipes/hplip/hplip-2.8.10/cross-build.patch
new file mode 100644
index 0000000000..3bf32513c3
--- /dev/null
+++ b/recipes/hplip/hplip-2.8.10/cross-build.patch
@@ -0,0 +1,165 @@
+Index: hplip-2.8.10/Makefile.am
+===================================================================
+--- hplip-2.8.10.orig/Makefile.am	2008-10-31 18:25:17.000000000 -0400
++++ hplip-2.8.10/Makefile.am	2008-11-10 12:18:45.000000000 -0500
+@@ -47,6 +47,7 @@
+ hp_LDADD = libhpmud.la $(DBUS_LIBS)
+ hp_CFLAGS = $(DBUS_CFLAGS)
+ 
++if !EMBEDDED_BUILD
+ # hp-mkuri.
+ hp_mkuridir = $(bindir)
+ hp_mkuri_PROGRAMS = hp-mkuri
+@@ -110,6 +111,7 @@
+ noinst_PROGRAMS += ptest
+ ptest_SOURCES = pcard/ptest.c pcard/ptest.h pcard/fat.c pcard/fat.h 
+ ptest_LDADD = libhpmud.la
++endif
+ 
+ # data
+ modelsdir = $(hplipdir)/data/models
+@@ -127,6 +129,7 @@
+ dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz
+ dist_models_DATA = data/models/models.dat
+ 
++if !EMBEDDED_BUILD
+ if GUI_BUILD
+ dist_images_16x16_DATA = data/images/16x16/*
+ dist_images_24x24_DATA = data/images/24x24/*
+@@ -147,7 +150,9 @@
+ 	data/localization/hplip_pt.qm data/localization/hplip_ru.qm data/localization/hplip_zh.qm
+ dist_noinst_DATA += data/localization/hplip_de.ts data/localization/hplip_es.ts data/localization/hplip_fr.ts data/localization/hplip_it.ts \
+ 	data/localization/hplip_pt.ts data/localization/hplip_ru.ts data/localization/hplip_zh.ts
++endif
+ 
++if !EMBEDDED_BUILD
+ # pcard 
+ pcarddir = $(hplipdir)/pcard
+ dist_pcard_SCRIPTS = pcard/__init__.py pcard/photocard.py
+@@ -170,6 +175,7 @@
+ cupsext_la_SOURCES =  prnt/cupsext/cupsext.c 
+ cupsext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
+ cupsext_la_LIBADD = -lcups
++endif
+ 
+ # ip library
+ lib_LTLIBRARIES += libhpip.la
+@@ -223,6 +229,7 @@
+ endif
+ libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
+ 
++if !EMBEDDED_BUILD
+ # hpmudext
+ hpmudextdir = $(pyexecdir)
+ hpmudext_LTLIBRARIES = hpmudext.la
+@@ -232,8 +239,9 @@
+ hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
+ 
+ # hpmud.rules
+-rulesdir = /etc/udev/rules.d
++rulesdir = $(sysconfdir)/udev/rules.d
+ dist_rules_DATA = data/rules/55-hpmud.rules
++endif
+ 
+ # ui (qt3)
+ if GUI_BUILD
+@@ -327,6 +335,7 @@
+ #	cherrypy/filters/virtualhostfilter.py cherrypy/filters/gzipfilter.py cherrypy/filters/wsgiappfilter.py \
+ #	cherrypy/filters/logdebuginfofilter.py cherrypy/filters/xmlrpcfilter.py
+ 
++if !EMBEDDED_BUILD
+ # hppgsz
+ noinst_PROGRAMS += hppgsz
+ hppgsz_SOURCES = $(apdk_SOURCES) prnt/hpijs/PrinterProperties.cpp prnt/hpijs/PrinterProperties.h
+@@ -337,11 +346,13 @@
+ # hplip.desktop
+ hplip_desktopdir = $(icondir)
+ hplip_desktop_DATA = hplip.desktop
++endif
+ 
+ # hplip.conf
+-hplip_confdir = /etc/hp
++hplip_confdir = $(sysconfdir)/hp
+ hplip_conf_DATA = hplip.conf
+ 
++if !EMBEDDED_BUILD
+ # hplip-systray.desktop
+ hplip_systraydir = $(systraydir)
+ hplip_systray_DATA = hplip-systray.desktop
+@@ -350,14 +361,17 @@
+ hplipjsdir = $(cupsfilterdir)
+ hplipjs_PROGRAMS = hplipjs
+ hplipjs_SOURCES = prnt/filters/hplipjs.c
++endif
+ 
+ endif	# if HPLIP_BUILD
+ 
++if !EMBEDDED_BUILD
+ # foomatic-rip-hplip
+ if RIP_INSTALL
+ ripdir = $(cupsfilterdir)
+ dist_rip_SCRIPTS = prnt/hpijs/foomatic-rip-hplip
+ endif
++endif
+ 
+ # hpijs
+ bin_PROGRAMS = hpijs
+@@ -416,6 +430,7 @@
+ dist_cupsdrv_DATA = $(foomatic_drv)
+ endif
+ 
++if !EMBEDDED_BUILD
+ install-data-hook: 
+ if HPLIP_BUILD
+ #	   If scanner build, add hpaio entry to sane dll.conf.
+@@ -455,6 +470,7 @@
+ #	   Remove fax support.
+ 	rm -f $(DESTDIR)$(hpfaxdir)/hpfax 
+ endif
++endif
+ 
+ rpm_unleaded:
+ 	epm -f rpm hpliplite UNLEADED=1 hplip.list
+Index: hplip-2.8.10/configure.in
+===================================================================
+--- hplip-2.8.10.orig/configure.in	2008-10-31 18:26:57.000000000 -0400
++++ hplip-2.8.10/configure.in	2008-11-06 18:00:46.000000000 -0500
+@@ -127,6 +127,8 @@
+ fi
+ AM_CONDITIONAL(NETWORK_BUILD, test x$network_build = xyes)
+ 
++AM_CONDITIONAL(EMBEDDED_BUILD, test 1=1)
++
+ AC_MSG_CHECKING([for parallel port build])
+ AC_ARG_ENABLE(pp_build,
+   [  --enable-pp-build    enable parallel port build (default=yes)],
+@@ -205,16 +207,16 @@
+ AM_CONDITIONAL(SHADOW_BUILD, test x$shadow_build = xyes)
+ 
+ AC_ARG_WITH(cupsbackenddir, AC_HELP_STRING([--with-cupsbackenddir=DIR], [set cups backend install directory [default=/usr/lib/cups/backend]]),
+-   cupsbackenddir=$withval, cupsbackenddir="/usr/lib/cups/backend")
++   cupsbackenddir=$withval, cupsbackenddir="$prefix/lib/cups/backend")
+ 
+ AC_ARG_WITH(cupsfilterdir, AC_HELP_STRING([--with-cupsfilterdir=DIR], [set cups filter install directory [default=/usr/lib/cups/filter]]),
+-   cupsfilterdir=$withval, cupsfilterdir="/usr/lib/cups/filter")
++   cupsfilterdir=$withval, cupsfilterdir="$prefix/lib/cups/filter")
+ 
+ AC_ARG_WITH(icondir, AC_HELP_STRING([--with-icondir=DIR], [set hplip.desktop install directory [default=/usr/share/applications]]),
+-   icondir=$withval, icondir="/usr/share/applications")
++   icondir=$withval, icondir="$prefix/share/applications")
+ 
+ AC_ARG_WITH(systraydir, AC_HELP_STRING([--with-systraydir=DIR], [set hplip-systray.desktop install directory [default=/etc/xdg/autostart]]),
+-   systraydir=$withval, systraydir="/etc/xdg/autostart")
++   systraydir=$withval, systraydir="$sysconfdir/xdg/autostart")
+ 
+ AC_ARG_WITH(hpppddir, AC_HELP_STRING([--with-hpppddir=DIR], [set hp ppd install directory [default=datadir/ppd/HP]]),
+    hpppddir=$withval, hpppddir="$datadir/ppd/HP")
+@@ -335,7 +337,7 @@
+    PYTHONINCLUDEDIR=`$PYTHON -c "from distutils.sysconfig import get_python_inc; print get_python_inc();"`
+    AC_MSG_RESULT("using $PYTHONINCLUDEDIR")
+    AC_ARG_VAR(PYTHONINCLUDEDIR, [path to Python.h C header file])
+-   AC_CHECK_HEADERS(python$PYTHON_VERSION/Python.h, ,[AC_MSG_ERROR([cannot find python-devel support], 6)])
++   AC_CHECK_HEADERS($PYTHONINCLUDEDIR/Python.h, ,[AC_MSG_ERROR([cannot find python-devel support], 6)])
+ fi
+ 
+ if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes"; then
diff --git a/recipes/hplip/hplip_2.8.10.bb b/recipes/hplip/hplip_2.8.10.bb
new file mode 100644
index 0000000000..7f8c0e1c36
--- /dev/null
+++ b/recipes/hplip/hplip_2.8.10.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "HP Linux Imaging and Printing"
+LICENSE = "GPL, MIT"
+
+# currently, we build a stripped down version that only includes IJS
+# and components required to implement a minimal printing system
+# for embedded systems.
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
+           file://cross-build.patch;patch=1"
+
+PR = "r1"
+
+inherit autotools
+
+EXTRA_OECONF = ' \
+                BUILD_SYS="" HOST_SYS="" \
+                --disable-network-build \
+                --disable-doc-build \
+                --disable-pp-build \
+                --disable-scan-build \
+                --disable-gui-build \
+                --disable-fax-build \
+                --disable-dbus-build \
+                --disable-foomatic-drv-install \
+                --disable-foomatic-rip-hplip-install \
+               '
+
+# needed by python checks in configure
+EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""'
+
+PACKAGES += "${PN}-ppd ${PN}-cups ${PN}-backend"
+
+# need to snag the debug file or OE will fail on backend package
+FILES_${PN}-dbg += "\
+     ${libdir}/cups/backend/.debug
+
+FILES_${PN}-ppd = "\
+     ${datadir}/ppd"
+
+FILES_${PN}-cups = "\
+     ${datadir}/cups"
+
+FILES_${PN}-backend = "\
+     ${libdir}/cups/backend"
+
diff --git a/recipes/jamvm/jamvm-initial_1.4.5.bb b/recipes/jamvm/jamvm-initial_1.4.5.bb
index c71811dd4e..1566deba61 100644
--- a/recipes/jamvm/jamvm-initial_1.4.5.bb
+++ b/recipes/jamvm/jamvm-initial_1.4.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 
 DEPENDS = "zlib-native classpath-initial jikes-initial"
 
-PR = "r0"
+PR = "r1"
 
 PROVIDES = "virtual/java-initial"
 
@@ -19,12 +19,16 @@ ARM_INSTRUCTION_SET = "arm"
 
 inherit native autotools
 
+# libdir must be modified so that jamvm-initial and -native
+# do not interfere
 EXTRA_OECONF = "\
   --with-classpath-install-dir=${prefix} \
   --program-suffix=-initial \
+  --libdir=${STAGING_LIBDIR}/jamvm-initial \
   "
 
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
+# jamvm-initial has to run some binaries which need lots of memory.
+CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB"
 
 do_compile() {
   oe_runmake \
diff --git a/recipes/jamvm/jamvm-initial_1.5.0.bb b/recipes/jamvm/jamvm-initial_1.5.0.bb
index a1c415dd62..1566deba61 100644
--- a/recipes/jamvm/jamvm-initial_1.5.0.bb
+++ b/recipes/jamvm/jamvm-initial_1.5.0.bb
@@ -19,12 +19,16 @@ ARM_INSTRUCTION_SET = "arm"
 
 inherit native autotools
 
+# libdir must be modified so that jamvm-initial and -native
+# do not interfere
 EXTRA_OECONF = "\
   --with-classpath-install-dir=${prefix} \
   --program-suffix=-initial \
+  --libdir=${STAGING_LIBDIR}/jamvm-initial \
   "
 
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
+# jamvm-initial has to run some binaries which need lots of memory.
+CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB"
 
 do_compile() {
   oe_runmake \
diff --git a/recipes/lesstif/lesstif_0.95.0.bb b/recipes/lesstif/lesstif_0.95.0.bb
index cb348e70db..5af87e3d41 100644
--- a/recipes/lesstif/lesstif_0.95.0.bb
+++ b/recipes/lesstif/lesstif_0.95.0.bb
@@ -1,7 +1,7 @@
 SECTION = "libs"
 DESCRIPTION = "Free OSM/Motif implementation."
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/lesstif/${BP}.tar.bz2 \
@@ -40,7 +40,7 @@ addtask preconfigure after do_patch before do_configure
 EXTRA_OECONF = "\
 	--with-gnu-ld --disable-verbose --disable-build-12 --disable-build-20 \
 	--enable-build-21 --enable-xrender --enable-production --without-motif \
-	--x-includes=. \
+	--x-includes=. --x-libraries=. \
 "
 
 PACKAGES += "${PN}-bin"
diff --git a/recipes/linux/linux-mini2440-2.6.29+git/defconfig-mini2440 b/recipes/linux/linux-mini2440-2.6.31+git/defconfig
index 9e71cbe0ee..71152187ac 100644
--- a/recipes/linux/linux-mini2440-2.6.29+git/defconfig-mini2440
+++ b/recipes/linux/linux-mini2440-2.6.31+git/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29.3
-# Sun May 10 15:49:07 2009
+# Linux kernel version: 2.6.30
+# Wed Jun 17 15:34:49 2009
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -39,6 +39,7 @@ CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
@@ -65,6 +66,9 @@ CONFIG_IPC_NS=y
 # CONFIG_NET_NS is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -74,6 +78,7 @@ CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+# CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -93,11 +98,13 @@ CONFIG_SLUB_DEBUG=y
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_CLK=y
+# CONFIG_SLOW_WORK is not set
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -110,7 +117,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
 CONFIG_LBD=y
-# CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_BLK_DEV_INTEGRITY=y
 
@@ -139,6 +145,7 @@ CONFIG_FREEZER=y
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
@@ -159,6 +166,7 @@ CONFIG_FREEZER=y
 # CONFIG_ARCH_ORION5X is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 CONFIG_ARCH_S3C2410=y
@@ -287,9 +295,10 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HZ=200
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
-CONFIG_ARCH_FLATMEM_HAS_HOLES=y
+# CONFIG_ARCH_HAS_HOLES_MEMORYMODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+# CONFIG_HIGHMEM is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -302,6 +311,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_VIRT_TO_BUS=y
 CONFIG_UNEVICTABLE_LRU=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -311,8 +322,7 @@ CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
 CONFIG_CMDLINE=""
 # CONFIG_XIP_KERNEL is not set
-CONFIG_KEXEC=y
-CONFIG_ATAGS_PROC=y
+# CONFIG_KEXEC is not set
 
 #
 # CPU Power Management
@@ -352,7 +362,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-CONFIG_COMPAT_NET_DEV_OPS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -441,6 +450,7 @@ CONFIG_LLC=m
 # CONFIG_LAPB is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_DCB is not set
 
@@ -475,21 +485,19 @@ CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
 CONFIG_BT_HCIVHCI=m
 # CONFIG_AF_RXRPC is not set
-# CONFIG_PHONET is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
-CONFIG_CFG80211=m
+CONFIG_CFG80211=y
 CONFIG_CFG80211_REG_DEBUG=y
-CONFIG_NL80211=y
 CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
+CONFIG_LIB80211=y
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
 CONFIG_LIB80211_CRYPT_TKIP=m
 # CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
+CONFIG_MAC80211=y
 
 #
 # Rate control algorithm selection
@@ -626,21 +634,17 @@ CONFIG_MTD_QINFO_PROBE=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=65536
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_ISL29003 is not set
 # CONFIG_C2PORT is not set
 
 #
@@ -649,7 +653,7 @@ CONFIG_MISC_DEVICES=y
 CONFIG_EEPROM_AT24=y
 # CONFIG_EEPROM_AT25 is not set
 # CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_93CX6 is not set
+CONFIG_EEPROM_93CX6=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -692,9 +696,11 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SRP_ATTRS is not set
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
 CONFIG_NETDEVICES=y
+CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
@@ -710,6 +716,7 @@ CONFIG_DM9000=y
 CONFIG_DM9000_DEBUGLEVEL=4
 # CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set
 # CONFIG_ENC28J60 is not set
+# CONFIG_ETHOC is not set
 # CONFIG_SMC911X is not set
 # CONFIG_SMSC911X is not set
 # CONFIG_DNET is not set
@@ -732,14 +739,17 @@ CONFIG_WLAN_80211=y
 CONFIG_LIBERTAS=m
 # CONFIG_LIBERTAS_USB is not set
 CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
 # CONFIG_LIBERTAS_DEBUG is not set
-# CONFIG_LIBERTAS_THINFIRM is not set
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_RTL8187 is not set
+CONFIG_LIBERTAS_THINFIRM=m
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AT76C50X_USB=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8187=m
 # CONFIG_MAC80211_HWSIM is not set
 # CONFIG_P54_COMMON is not set
-# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_AR9170_USB is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
@@ -747,7 +757,16 @@ CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 # CONFIG_B43LEGACY is not set
 CONFIG_ZD1211RW=m
 CONFIG_ZD1211RW_DEBUG=y
-# CONFIG_RT2X00 is not set
+CONFIG_RT2X00=y
+# CONFIG_RT2500USB is not set
+CONFIG_RT73USB=y
+CONFIG_RT2X00_LIB_USB=y
+CONFIG_RT2X00_LIB=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_RFKILL=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -760,20 +779,28 @@ CONFIG_ZD1211RW_DEBUG=y
 # CONFIG_USB_KAWETH is not