Purple 3.2.1 Release

Signed-off-by: Graeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

bitbake/lib/bb/data_smart.py

@@ -171,14 +171,15 @@ class DataSmart:
         Rename the variable key to newkey 
         """
         val = self.getVar(key, 0)
-        if val is None:
-            return
-
-        self.setVar(newkey, val)
+        if val is not None:
+            self.setVar(newkey, val)
 
         for i in ('_append', '_prepend'):
+            src = self.getVarFlag(key, i)
+            if src is None:
+                continue
+
             dest = self.getVarFlag(newkey, i) or []
-            src = self.getVarFlag(key, i) or []
             dest.extend(src)
             self.setVarFlag(newkey, i, dest)
             

bitbake/lib/bb/fetch/__init__.py

@@ -153,14 +153,16 @@ def init(urls, d, setup = True):
     urldata_cache[fn] = urldata
     return urldata
 
-def go(d):
+def go(d, urls = None):
     """
     Fetch all urls
     init must have previously been called
     """
-    urldata = init([], d, True)
+    if not urls:
+        urls = d.getVar("SRC_URI", 1).split()
+    urldata = init(urls, d, True)
 
-    for u in urldata:
+    for u in urls:
         ud = urldata[u]
         m = ud.method
         if ud.localfile:

build/conf/local.conf.sample

@@ -19,11 +19,11 @@ BBFILE_PRIORITY_moblin = "5"
 # PARALLEL_MAKE = "-j 4"
 
 # The machine to target
-MACHINE ?= "netbook"
+MACHINE ?= "qemux86"
 
 # Other supported machines
-#MACHINE ?= "qemux86"
 #MACHINE ?= "qemuarm"
+#MACHINE ?= "netbook"
 #MACHINE ?= "c7x0"
 #MACHINE ?= "akita"
 #MACHINE ?= "spitz"
@@ -151,3 +151,9 @@ SRC_TARBALL_STASH = "http://pokylinux.org/sources/"
 #ASSUME_PROVIDED += "gtk+-native libglade-native"
 
 ENABLE_BINARY_LOCALE_GENERATION = "1"
+
+# The architecture to build SDK items for, by setting this you can build SDK
+# packages for architectures other than the host i.e. building i586 packages
+# on an x86_64 host.
+# Supported values are i586 and x86_64
+#SDKMACHINE="i586"

handbook/Makefile

@@ -2,7 +2,7 @@ all: html pdf
 
 pdf:
 
-	poky-docbook-to-pdf poky-handbook.xml
+	./poky-doc-tools/poky-docbook-to-pdf poky-handbook.xml
 #       -- old way --
 #	dblatex poky-handbook.xml
 

handbook/introduction.xml

@@ -58,7 +58,7 @@
     <screenshot>
     <mediaobject>
         <imageobject>
-            <imagedata fileref="screenshots/ss-sato.png" format="PNG"/>
+            <imagedata fileref="screenshots/ss-sato.png" format="PNG" align='center' scalefit='1' width="100%" contentdepth="100%"/>
         </imageobject>
         <caption>
             <para>The Sato Desktop - A screenshot from a machine running a Poky built image</para>
@@ -173,17 +173,17 @@ provided by the principal developer and maintainer of Poky, <ulink url="http://o
         <para>
             If you want to try Poky, you can do so in a few commands. The example below
             checks out the Poky source code, sets up a build environment, builds an
-            image and then runs that image under the QEMU emulator in ARM system emulation mode:
+            image and then runs that image under the QEMU emulator in x86 system emulation mode:
         </para>
 
         <para>
             <literallayout class='monospaced'>
-$ wget http://pokylinux.org/releases/pinky-3.1.tar.gz
-$ tar zxvf pinky-3.1.tar.gz
-$ cd pinky-3.1/
+$ wget http://pokylinux.org/releases/purple-3.2.1.tar.gz
+$ tar zxvf purple-3.2.1.tar.gz
+$ cd purple-3.2.1/
 $ source poky-init-build-env
 $ bitbake poky-image-sato
-$ runqemu qemuarm
+$ runqemu qemux86
 </literallayout>
         </para>
 

handbook/poky-doc-tools/README

@@ -1,7 +1,7 @@
 poky-doc-tools
 ==============
 
-Simple tools to wrap fop to create oh branded PDF's from docbook sources.
+Simple tools to wrap fop to create Poky branded PDF's from docbook sources.
 (based on OH doc tools)
 
 Dependencies
@@ -9,15 +9,10 @@ Dependencies
 
 Sun Java, make sure the java in your path is the *sun* java.
 
-xlstproc, nwalsh style sheets.
+xlstproc, nwalsh style sheets, fop
 
 FOP, installed - see http://www.sagehill.net/docbookxsl/InstallingAnFO.html.
-Also a 'fop' binary, eg I have;
-
-% cat ~/bin/fop
-#!/bin/sh
-java org.apache.fop.apps.Fop "$@"
-
+Updated to work with (fop > 0.95)
 
 
 

handbook/poky-doc-tools/common/fop-config.xml.in

@@ -1,33 +1,58 @@
-<configuration>
-  <entry>
-  <!--
-   Set the baseDir so common/openedhand.svg references in plans still
-   work ok. Note, relative file references to current dir should still work.
-   -->	
-    <key>baseDir</key>
-    <value>@datadir@</value>
-  </entry>
-  <fonts>
-    <font  metrics-file="@datadir@/common/VeraMono.xml"
-           kerning="yes" 
-           embed-file="@datadir@/common/VeraMono.ttf">
-      <font-triplet name="veramono" style="normal" weight="normal"/>
-    </font>
+<fop version="1.0">
 
-    <font  metrics-file="@datadir@/common/VeraMoBd.xml"
-           kerning="yes" 
-           embed-file="@datadir@/common/VeraMoBd.ttf">
-      <font-triplet name="veramono" style="normal" weight="bold"/>
-    </font>
+  <!-- Strict user configuration -->
+  <strict-configuration>true</strict-configuration>
 
-    <font  metrics-file="@datadir@/common/Vera.xml"
-           kerning="yes" 
-           embed-file="@datadir@/common/Vera.ttf">
-     <font-triplet name="verasans" style="normal" weight="normal"/>
-     <font-triplet name="verasans" style="normal" weight="bold"/>
-     <font-triplet name="verasans" style="italic" weight="normal"/>
-     <font-triplet name="verasans" style="italic" weight="bold"/>
-    </font>
+  <!-- Strict FO validation -->
+  <strict-validation>true</strict-validation>
+
+   <!--
+    Set the baseDir so common/openedhand.svg references in plans still
+    work ok. Note, relative file references to current dir should still work.
+    -->	
+  <base>@datadir@</base>
+  <font-base>@datadir@/common</font-base>
+ 
+  <!-- Source resolution in dpi (dots/pixels per inch) for determining the
+       size of pixels in SVG and bitmap images, default: 72dpi -->
+  <!-- <source-resolution>72</source-resolution> -->
+  <!-- Target resolution in dpi (dots/pixels per inch) for specifying the
+       target resolution for generated bitmaps, default: 72dpi -->
+  <!-- <target-resolution>72</target-resolution> -->
+ 
+  <!-- default page-height and page-width, in case
+       value is specified as auto -->
+  <default-page-settings height="11in" width="8.26in"/> 
+ 
+  <!-- <use-cache>false</use-cache> -->
+ 
+  <renderers>
+    <renderer mime="application/pdf">
+      <fonts>
+        <font  metrics-file="VeraMono.xml"
+               kerning="yes" 
+               embed-url="VeraMono.ttf">
+          <font-triplet name="veramono" style="normal" weight="normal"/>
+        </font>
+
+        <font  metrics-file="VeraMoBd.xml"
+               kerning="yes" 
+               embed-url="VeraMoBd.ttf">
+          <font-triplet name="veramono" style="normal" weight="bold"/>
+        </font>
+
+        <font  metrics-file="Vera.xml"
+               kerning="yes" 
+               embed-url="Vera.ttf">
+          <font-triplet name="verasans" style="normal" weight="normal"/>
+          <font-triplet name="verasans" style="normal" weight="bold"/>
+          <font-triplet name="verasans" style="italic" weight="normal"/>
+          <font-triplet name="verasans" style="italic" weight="bold"/>
+        </font>
+        
+        <auto-detect/>
+      </fonts>
+    </renderer>
+  </renderers>
+</fop>
 
-  </fonts>
-</configuration>

handbook/poky-doc-tools/common/poky-db-pdf.xsl

@@ -54,7 +54,7 @@
  
   <!-- general settings -->
 
-  <xsl:param name="fop.extensions" select="1"></xsl:param>
+  <xsl:param name="fop1.extensions" select="1"></xsl:param>
   <xsl:param name="paper.type" select="'A4'"></xsl:param>
   <xsl:param name="section.autolabel" select="1"></xsl:param>
   <xsl:param name="body.font.family" select="'verasans'"></xsl:param>

handbook/poky-handbook.xml

@@ -11,7 +11,7 @@
             <imageobject>
                 <imagedata fileref='common/poky-handbook.png' 
                     format='SVG' 
-                    align='center'/>
+                    align='center' scalefit='1' width='100%'/>
             </imageobject>    
         </mediaobject>
 

handbook/ref-structure.xml

@@ -218,7 +218,6 @@
 
     <section id='structure-build-tmp-staging'>
         <title><filename class="directory">build/tmp/staging/</filename></title>
-
         <para>
             Any package needing to share output with other packages does so within staging.
             This means it contains any shared header files and any shared libraries amongst

meta/classes/cross-canadian.bbclass

@@ -31,6 +31,14 @@ CFLAGS = "${BUILDSDK_CFLAGS}"
 CXXFLAGS = "${BUILDSDK_CFLAGS}"
 LDFLAGS = "${BUILDSDK_LDFLAGS}"
 
+# Path mangling needed by the cross packaging
+# Note that we use := here to ensure that libdir and includedir are
+# target paths, not CROSS_DIR paths.
+target_libdir := "${libdir}"
+target_includedir := "${includedir}"
+target_base_libdir := "${base_libdir}"
+target_prefix := "${prefix}"
+
 # Change to place files in SDKPATH
 prefix = "${SDKPATH}"
 exec_prefix = "${SDKPATH}"

meta/classes/insane.bbclass

@@ -289,7 +289,7 @@ def package_qa_check_arch(path,name,d):
     target_arch = bb.data.getVar('TARGET_ARCH', d, True)
 
     # FIXME: Cross package confuse this check, so just skip them
-    if bb.data.inherits_class('cross', d) or bb.data.inherits_class('nativesdk', d):
+    if bb.data.inherits_class('cross', d) or bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('cross-canadian', d):
         return True
 
     # avoid following links to /usr/bin (e.g. on udev builds)

meta/classes/package.bbclass

@@ -210,12 +210,12 @@ def runtime_mapping_rename (varname, d):
 	#bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, True)))	
 
 	new_depends = []
-	for depend in bb.utils.explode_deps(bb.data.getVar(varname, d, True) or ""):
+	deps = bb.utils.explode_dep_versions(bb.data.getVar(varname, d, True) or "")
+	for depend in deps:
 		# Have to be careful with any version component of the depend
-		split_depend = depend.split(' (')
-		new_depend = get_package_mapping(split_depend[0].strip(), d)
-		if len(split_depend) > 1:
-			new_depends.append("%s (%s" % (new_depend, split_depend[1]))
+		new_depend = get_package_mapping(depend, d)
+		if deps[depend]:
+			new_depends.append("%s (%s)" % (new_depend, deps[depend]))
 		else:
 			new_depends.append(new_depend)
 

meta/conf/distro/include/poky-eabi.inc

@@ -25,6 +25,7 @@ PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-sdk ?= "${GCCVERSION}"
 PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
 PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}"
+PREFERRED_VERSION_binutils-cross-canadian ?= "${BINUVERSION}"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.29"
 PREFERRED_VERSION_glibc ?= "2.6.1"
 PREFERRED_VERSION_glibc-initial ?= "2.6.1"

meta/conf/distro/include/poky-fixed-revisions.inc

@@ -85,7 +85,8 @@ SRCREV_pn-libowl-av = "398"
 SRCREV_pn-owl-video = "394"
 SRCREV_pn-psplash ?= "422"
 #QEMUSRCREV = "6477"
-QEMUSRCREV = "9e3a7df77c6c456ff58ab9931cb86e3d5983404d"
+QEMUSRCREV = "9eab386edbf8cf002a731f8204a156f243a47a57"
+#QEMUSRCREV = "1bec86a0bcaac7fa07f3081b3e26b9c7e1ec072c"
 SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu-nativesdk ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu ?= "${QEMUSRCREV}"
@@ -113,7 +114,7 @@ SRCREV_pn-networkmanager ?= "2984"
 SRCREV_pn-table ?= "4b267533ce16656cba4104fc39dc12709c1bdddf"
 SRCREV_pn-ubootchart ?= "10"
 
-SRCREV_pn-dates ?= "966969063535da0786b7483c1bcd427df8a0d87d"
+SRCREV_pn-dates ?= "f8a6271eb45c4ec912466923c045fc960a4d894a"
 SRCREV_pn-tasks ?= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
 SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
 SRCREV_pn-dfu-util-native ?= "3139"

meta/conf/distro/poky.conf

@@ -3,7 +3,7 @@
 
 DISTRO = "poky"
 DISTRO_NAME = "OpenedHand Linux (Poky)"
-DISTRO_VERSION = "3.2+snapshot-${DATE}"
+DISTRO_VERSION = "3.2.1"
 
 MAINTAINER = "OpenedHand <poky@openedhand.com>"
 
@@ -113,5 +113,7 @@ DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
 
 IMAGE_FEATURES ?= ""
 
+EXTRAOPKGCONFIG = "poky-feed-config-opkg"
+
 require conf/distro/include/world-broken.inc
 

meta/conf/machine/zoom2.conf

@@ -4,7 +4,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7a"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap3-pm"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-zoomsync"
 
 MACHINE_FEATURES = "kernel26 apm alsa usbgadget usbhost screen touchscreen"
 

meta/packages/fakeroot/fakeroot/absolutepaths.patch

@@ -0,0 +1,47 @@
+Image creation runs under a fakeroot context and calls a script which refers 
+to the build systems's python. This loads but can find a libpython from staging
+if these are incompatible, anything can break. These scripts should *not* be
+changing LD_LIBRARY_PATH, just adding an LD_PRELOAD with an absolute path. The
+dyanmic linker can figure out anything else with rpaths.
+
+RP - 23/1/10
+
+Index: fakeroot-1.9.4/configure.ac
+===================================================================
+--- fakeroot-1.9.4.orig/configure.ac	2010-01-23 22:34:39.000000000 +0000
++++ fakeroot-1.9.4/configure.ac	2010-01-23 22:35:14.000000000 +0000
+@@ -414,6 +414,8 @@
+ 		;;
+ esac
+ 
++LDPRELOADABS=1
++
+ AC_DEFINE_UNQUOTED([LIBCPATH], "$libcpath", [path to libc shared object])
+ AC_SUBST(DLSUFFIX)
+ AC_SUBST(LDLIBPATHVAR)
+Index: fakeroot-1.9.4/scripts/fakeroot.in
+===================================================================
+--- fakeroot-1.9.4.orig/scripts/fakeroot.in	2010-01-23 22:34:53.000000000 +0000
++++ fakeroot-1.9.4/scripts/fakeroot.in	2010-01-23 22:37:17.000000000 +0000
+@@ -135,7 +135,7 @@
+ if [ "$WAITINTRAP" -eq 0 ]; then
+   trap "kill -s @signal@ $PID" EXIT INT
+ else
+-  trap 'FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS"  LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
++  trap 'FAKEROOTKEY=$FAKEROOTKEY LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
+ fi
+ 
+ if test -z "$FAKEROOTKEY" || test -z "$PID"; then
+@@ -158,10 +158,10 @@
+ export FAKEROOT_FD_BASE
+ 
+ if test -z "$*"; then
+-  FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
++  FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
+   RESULT=$?
+ else
+-  FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"
++  FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"
+   RESULT=$?
+ fi
+ 

meta/packages/fakeroot/fakeroot_1.9.4.bb

@@ -5,10 +5,11 @@ LICENSE = "GPL"
 # fakeroot needs getopt which is provided by the util-linux package
 RDEPENDS = "util-linux"
 RDEPENDS_virtclass-native = "util-linux-native"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
-           file://configure-libtool.patch;patch=1"
+           file://configure-libtool.patch;patch=1 \
+           file://absolutepaths.patch;patch=1 "
 	    
 inherit autotools_stage
 

meta/packages/feed-config/poky-feed-config-opkg_1.0.bb

@@ -0,0 +1,42 @@
+DESCRIPTION = "Poky exampl feed configuration"
+
+PR = "r1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#FEEDNAMEPREFIX ?= "INVALID"
+#FEEDURIPREFIX ?= "INVALID"
+
+do_compile() {
+	mkdir -p ${S}/${sysconfdir}/opkg/
+
+	archconf=${S}/${sysconfdir}/opkg/arch.conf
+
+	rm -f $archconf
+	ipkgarchs="${PACKAGE_ARCHS}"
+	priority=1
+	for arch in $ipkgarchs; do 
+		echo "arch $arch $priority" >> $archconf
+		priority=$(expr $priority + 5)
+	done
+
+	basefeedconf=${S}/${sysconfdir}/opkg/base-feeds.conf
+
+	rm -f $basefeedconf
+	touch $basefeedconf
+
+	#for arch in $ipkgarchs; do
+	#        echo "src/gz ${FEEDNAMEPREFIX}-$arch http://pokylinux.org/${FEEDURIPREFIX}$arch" >> $basefeedconf
+	#done
+}
+
+
+do_install () {
+	install -d ${D}${sysconfdir}/opkg
+	install -m 0644  ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
+}
+
+FILES_${PN} = "${sysconfdir}/opkg/ "
+
+CONFFILES_${PN} += "${sysconfdir}/opkg/base-feeds.conf \
+                    ${sysconfdir}/opkg/arch.conf"
+

meta/packages/gcc/gcc-common.inc

@@ -33,3 +33,7 @@ BINV = "${PV}"
 S = "${WORKDIR}/gcc-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
+target_includedir ?= "${includedir}"
+target_libdir ?= "${libdir}"
+target_base_libdir ?= "${base_libdir}"
+target_prefix ?= "${prefix}"

meta/packages/gcc/gcc-cross-canadian_4.3.3.bb

@@ -5,7 +5,7 @@ require gcc-cross-canadian.inc
 require gcc-configure-sdk.inc
 require gcc-package-sdk.inc
 
-PR = "r7"
+PR = "r8"
 
 DEPENDS += "gmp-nativesdk mpfr-nativesdk"
 RDEPENDS_${PN} += "mpfr-nativesdk"

meta/packages/gcc/gcc-cross_4.3.3.bb

@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc

meta/packages/gcc/gcc-package-target.inc

@@ -21,6 +21,7 @@ FILES_${PN} = "\
   ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
   ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
   ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
+  ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \
 "
 FILES_${PN}-symlinks = "\
   ${bindir}/cc \

meta/packages/gcc/gcc_3.4.4.bb

@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc

meta/packages/gcc/gcc_4.1.2.bb

@@ -1,4 +1,4 @@
-PR = "r12"
+PR = "r14"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc

meta/packages/gcc/gcc_4.2.3.bb

@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc

meta/packages/gcc/gcc_4.3.1.bb

@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc

meta/packages/gcc/gcc_4.3.3.bb

@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc

meta/packages/leafpad/leafpad_0.8.9.bb

@@ -1,8 +1,9 @@
 LICENSE = "GPLv2"
-DEPENDS = "gtk+ intltool-native libowl"
+DEPENDS = "gtk+ intltool-native"
+DEPENDS_append_poky = " libowl"
 SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \
 	   file://leafpad.desktop"
-PR = "r9"
+PR = "r10"
 
 SRC_URI_append_poky += " file://owl-menu.patch;patch=1 "
 

meta/packages/libowl/libowl_svn.bb

@@ -1,21 +1,10 @@
-# This recipe builds libowl and then stages the header and static lib;
-# it intentionally does not stage the shared lib and create a package.
-#
-# Libowl is currently a 'cut and paste' library; this package makes our
-# life a touch easier by not having to patch the source directly into
-# applications; instead we add -lowl to the linker cmdline. Also, when
-# we eventually make libowl into a normal shared library, this package
-# will make that transition rather simple.
-
 DESCRIPTION = "OpenedHand Widget Library"
 HOMEPAGE = "http://www.o-hand.com"
 LICENSE = "LGPL"
 SECTION = "libs"
 DEPENDS = "gtk+"
 PV = "0.0+svnr${SRCREV}"
-PR = "r4"
-
-PACKAGES = ""
+PR = "r5"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
 

meta/packages/linux/linux-omap-zoomsync_2.6.32.bb

@@ -0,0 +1,26 @@
+require linux.inc
+
+DESCRIPTION = "Linux kernel for OMAPZoom2 machine"
+KERNEL_IMAGETYPE = "uImage"
+
+COMPATIBLE_MACHINE = "zoom2"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_zoom2 = "1"
+
+SRCREV = "015cbaf1035cd9a61d33a27de2a22902555db3c5"
+OEV = "oe1+gitr${SRCREV}"
+
+PV = "2.6.32.7-${OEV}"
+
+SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;protocol=git \
+	   file://defconfig"
+
+SRC_URI_append = " \
+"
+
+S = "${WORKDIR}/git"
+
+PACKAGES =+ "omap-dss-doc"
+FILES_omap-dss-doc = "/boot/DSS"
+

meta/packages/mesa/qemugl-nativesdk_git.bb

@@ -0,0 +1,35 @@
+DESCRIPTION = "QEMU i386 OpenGL passtrough"
+HOMEPAGE = "http://savannah.nongnu.org/projects/qemugl"
+SECTION = "x11/drivers"
+LICENSE = "GPL"
+
+DEPENDS = "virtual/libx11 xproto glproto libxfixes"
+
+SRC_URI = "git://git.o-hand.com/qemugl.git;protocol=git \
+           file://versionfix.patch;patch=1"
+S = "${WORKDIR}/git"
+
+PV = "0.0+git${SRCREV}"
+PR = "r0"
+
+inherit nativesdk
+
+DEFAULT_PREFERENCE = "-1"
+
+do_install () {
+	install -d ${D}${libdir}/
+	install -m 0755 ${S}/libGL.so.1.2 ${D}${libdir}/libGL-qemu.so.1.2
+}
+
+do_stage () {
+  install -d ${STAGING_LIBDIR}
+  install -m 0755 ${S}/libGL.so.1.2 ${STAGING_LIBDIR}/libGL.so.1.2
+  ln -s libGL.so.1.2 ${STAGING_LIBDIR}/libGL.so.1
+  ln -s libGL.so.1 ${STAGING_LIBDIR}/libGL.so
+}
+
+pkg_postinst_${PN} () {
+    rm -f $D${libdir}/libGL.so.1.2
+    ln -s libGL-qemu.so.1.2 $D${libdir}/libGL.so.1.2
+}
+

meta/packages/mesa/qemugl_git.bb

@@ -12,7 +12,7 @@ SRC_URI = "git://git.o-hand.com/qemugl.git;protocol=git \
 S = "${WORKDIR}/git"
 
 PV = "0.0+git${SRCREV}"
-PR = "r5"
+PR = "r6"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -21,13 +21,6 @@ do_install () {
 	install -m 0755 ${S}/libGL.so.1.2 ${D}${libdir}/libGL-qemu.so.1.2
 }
 
-do_stage () {
-	install -d ${STAGING_LIBDIR}/
-	install -m 0755 ${S}/libGL.so.1.2 ${STAGING_LIBDIR}/libGL.so.1.2
-	ln -s libGL.so.1.2 ${STAGING_LIBDIR}/libGL.so.1
-	ln -s libGL.so.1 ${STAGING_LIBDIR}/libGL.so
-}
-
 pkg_postinst_${PN} () {
     rm -f $D${libdir}/libGL.so.1.2
     ln -s libGL-qemu.so.1.2 $D${libdir}/libGL.so.1.2

meta/packages/pcmanfm/pcmanfm_0.3.2.2.bb

@@ -2,9 +2,10 @@ LICENSE = "GPL"
 DESCRIPTION = "procfs tools"
 SECTION = "x11"
 PRIORITY = "optional"
-DEPENDS = "gtk+ libowl startup-notification"
+DEPENDS = "gtk+ startup-notification"
+DEPENDS_append_poky = " libowl"
 
-PR="r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
 	   file://gnome-fs-directory.png \
@@ -12,8 +13,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
 	   file://gnome-mime-text-plain.png \
 	   file://emblem-symbolic-link.png \
 	   file://desktop.patch;patch=1 \
-	   file://no-warnings.patch;patch=1 \
-	   file://owl-window-menu.patch;patch=1"
+	   file://no-warnings.patch;patch=1"
+
+SRC_URI_append_poky = " file://owl-window-menu.patch;patch=1"
 
 EXTRA_OECONF = "--enable-inotify --disable-hal"
 
@@ -27,4 +29,3 @@ do_install_append () {
 }
 
 FILES_${PN} += "${datadir}/pixmaps/*.png"
-

meta/packages/pimlico/contacts.inc

@@ -1,12 +1,16 @@
 DESCRIPTION = "Address-book application."
 LICENSE = "LGPL"
 SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ eds-dbus libowl"
+DEPENDS = "glib-2.0 gtk+ eds-dbus"
+DEPENDS_append_poky = " libowl"
 RDEPENDS = "libedata-book"
 
 inherit autotools_stage pkgconfig
 
-EXTRA_OECONF += "--disable-gnome-vfs"
+OWL = "--disable-owl"
+OWL_poky = "--enable-owl"
+
+EXTRA_OECONF += "--disable-gnome-vfs ${OWL}"
 EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
 
 do_install_append () {

meta/packages/pimlico/contacts_0.9.bb

@@ -1,5 +1,5 @@
 require contacts.inc
 
-PR="r1"
+PR = "r2"
 
 SRC_URI =+ "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz"

meta/packages/pimlico/contacts_git.bb

@@ -1,7 +1,7 @@
 require contacts.inc
 
 PV = "0.9+git${SRCPV}"
-
+PR = "r1"
 
 SRC_URI =+ "git://git.gnome.org/${PN};protocol=git"
 

meta/packages/pimlico/dates.inc

@@ -1,12 +1,16 @@
 DESCRIPTION = "Dates is a calendar application."
 LICENSE = "LGPL"
 SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libowl"
+DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
 RDEPENDS = "libedata-cal"
 
 inherit autotools_stage pkgconfig gtk-icon-cache
 
 # Poky/Sato specific enhancements
-EXTRA_OECONF_append_poky = " --enable-owl=true --disable-dnd"
+OWL = "--disable-owl"
+OWL_poky = "--enable-owl --disable-dnd"
+
+EXTRA_OECONF += "${OWL}"
+DEPENDS_append_poky = " libowl"
 SRC_URI_append_poky = " file://dates-owl-window-menu.patch;patch=1 "
 

meta/packages/pimlico/dates/dates-owl-window-menu.patch

@@ -1,23 +1,9 @@
 ---
- src/Makefile.am      |    2 +-
  src/dates_gtk.c      |    5 -----
  src/dates_main.c     |    5 +++++
  src/dates_platform.h |    2 +-
- 4 files changed, 7 insertions(+), 7 deletions(-)
+ 3 files changed, 7 insertions(+), 7 deletions(-)
 
-Index: git/src/Makefile.am
-===================================================================
---- git.orig/src/Makefile.am	2009-08-18 12:44:56.000000000 +0100
-+++ git/src/Makefile.am	2009-09-03 22:28:50.000000000 +0100
-@@ -35,7 +35,7 @@
- 	gconf-bridge.h		\
- 	gconf-bridge.c
- 
--dates_LDADD = $(DATES_LIBS) libgtkdatesview.la
-+dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl
- 
- if USE_OWL
- dates_LDADD += $(top_builddir)/libowl/libowl.la
 Index: git/src/dates_gtk.c
 ===================================================================
 --- git.orig/src/dates_gtk.c	2009-08-18 12:44:56.000000000 +0100

meta/packages/pimlico/dates_0.4.8.bb

@@ -1,7 +1,5 @@
 require dates.inc
 
-PR = "r1"
+PR = "r3"
 
-SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz \
-	   file://dates-owl-window-menu.patch;patch=1 \
-	  "
+SRC_URI = "http://pimlico-project.org/sources/dates/dates-${PV}.tar.gz"

meta/packages/pimlico/dates_git.bb

@@ -1,6 +1,8 @@
 require dates.inc
 
 PV = "0.4.9+git${SRCPV}"
+PR = "r2"
+
 S = "${WORKDIR}/git"
 
 SRC_URI = "git://git.gnome.org/${PN};protocol=git"

meta/packages/pimlico/tasks.inc

@@ -1,7 +1,12 @@
 DESCRIPTION = "Task list application"
 LICENSE = "GPL"
 SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ eds-dbus libowl"
+DEPENDS = "glib-2.0 gtk+ eds-dbus"
 DEPENDS_append_poky = " libowl"
 
 inherit autotools_stage pkgconfig gtk-icon-cache
+
+OWL = "--disable-owl"
+OWL_poky = "--enable-owl"
+
+EXTRA_OECONF += "${OWL}"

meta/packages/pimlico/tasks_0.13.bb

@@ -5,4 +5,4 @@ SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \
 
 SRC_URI_append_poky = " file://tasks-owl.diff;patch=1 "
 
-PR = "r2"
+PR = "r3"

meta/packages/pimlico/tasks_git.bb

@@ -3,4 +3,6 @@ require tasks.inc
 SRC_URI = "git://git.gnome.org/${PN};protocol=git"
 
 PV = "0.13+git${SRCPV}"
+PR = "r1"
+
 S = "${WORKDIR}/git"

meta/packages/pointercal/files/qemuarm/pointercal

@@ -1 +1 @@
-1280 0 1002 0 960 328 65536
+8313 4 -8526 7 8334 -82604 65536

meta/packages/pointercal/files/qemuarmv6/pointercal

@@ -1 +1 @@
-1281 -1 1640 2 960 -8804 65536
+8313 4 -8526 7 8334 -82604 65536

meta/packages/pointercal/files/qemuarmv7/pointercal

@@ -1 +1 @@
-1278 1 702 -1 961 52168 65536
+8313 4 -8526 7 8334 -82604 65536

meta/packages/pointercal/pointercal_0.0.bb

@@ -1,6 +1,6 @@
 DESCRIPTION = "Touchscreen calibration data"
 SECTION = "base"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "file://pointercal"
 S = "${WORKDIR}"

meta/packages/puzzles/oh-puzzles_svn.bb

@@ -1,18 +1,19 @@
 DESCRIPTION = "Portable Puzzle Collection"
 LICENSE = "MIT"
 SECTION = "x11"
-DEPENDS = "gtk+ gconf intltool-native librsvg libowl"
+DEPENDS = "gtk+ gconf intltool-native librsvg"
+DEPENDS_append_poky = " libowl"
 
 PV = "0.1+svnr${SRCREV}"
-PR = "r9"
+PR = "r10"
 
 bindir = "/usr/games"
 
 inherit autotools pkgconfig
 
 SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http"
-
 SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;patch=1;pnum=0 "
+
 S = "${WORKDIR}/${PN}"
 
 EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"

meta/packages/qemu/qemu-git/2ca2078e287174522e3a6229618947d3d285b8c0.patch

@@ -0,0 +1,130 @@
+From 2ca2078e287174522e3a6229618947d3d285b8c0 Mon Sep 17 00:00:00 2001
+From: François Revol <revol@free.fr>
+Date: Tue, 25 Aug 2009 09:14:10 +0000
+Subject: Fixed wacom emulation
+
+- for absolute mode, scale coordinates to the real device maximum values,
+since some drivers (on Haiku and Linux at least) need them as such,
+and the HID descriptor is boggus on some models anyway,
+- keep the coordinates even when no button is pressed, on real tablet
+the pen is sensed on the surface even without direct contact,
+and drivers expect this,
+- map left button to pressure according to what the Haiku driver wants,
+- map the right button to the pen button,
+- map the middle button to the eraser,
+- use asynchronous reporting as the hid code does, stops the Haiku driver
+(and probably others) from spending 50% cpu polling for changes.
+
+Signed-off-by: François Revol <revol@free.fr>
+Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
+---
+Index: git/hw/usb-wacom.c
+===================================================================
+--- git.orig/hw/usb-wacom.c	2009-11-24 14:10:15.000000000 +0000
++++ git/hw/usb-wacom.c	2009-11-24 16:39:26.000000000 +0000
+@@ -50,6 +50,8 @@
+         WACOM_MODE_HID = 1,
+         WACOM_MODE_WACOM = 2,
+     } mode;
++    uint8_t idle;
++    int changed;
+ } USBWacomState;
+ 
+ static const uint8_t qemu_wacom_dev_descriptor[] = {
+@@ -125,6 +127,7 @@
+     s->dy += dy1;
+     s->dz += dz1;
+     s->buttons_state = buttons_state;
++    s->changed = 1;
+ }
+ 
+ static void usb_wacom_event(void *opaque,
+@@ -132,10 +135,12 @@
+ {
+     USBWacomState *s = opaque;
+ 
+-    s->x = x;
+-    s->y = y;
++    /* scale to Penpartner resolution */
++    s->x = (x * 5040 / 0x7FFF);
++    s->y = (y * 3780 / 0x7FFF);
+     s->dz += dz;
+     s->buttons_state = buttons_state;
++    s->changed = 1;
+ }
+ 
+ static inline int int_clamp(int val, int vmin, int vmax)
+@@ -199,26 +204,22 @@
+     if (s->buttons_state & MOUSE_EVENT_LBUTTON)
+         b |= 0x01;
+     if (s->buttons_state & MOUSE_EVENT_RBUTTON)
+-        b |= 0x02;
++        b |= 0x40;
+     if (s->buttons_state & MOUSE_EVENT_MBUTTON)
+-        b |= 0x04;
++        b |= 0x20; /* eraser */
+ 
+     if (len < 7)
+         return 0;
+ 
+     buf[0] = s->mode;
+-    buf[5] = 0x00;
+-    if (b) {
+-        buf[1] = s->x & 0xff;
+-        buf[2] = s->x >> 8;
+-        buf[3] = s->y & 0xff;
+-        buf[4] = s->y >> 8;
++    buf[5] = 0x00 | (b & 0xf0);
++    buf[1] = s->x & 0xff;
++    buf[2] = s->x >> 8;
++    buf[3] = s->y & 0xff;
++    buf[4] = s->y >> 8;
++    if (b & 0x3f) {
+         buf[6] = 0;
+     } else {
+-        buf[1] = 0;
+-        buf[2] = 0;
+-        buf[3] = 0;
+-        buf[4] = 0;
+         buf[6] = (unsigned char) -127;
+     }
+ 
+@@ -350,7 +351,12 @@
+         else if (s->mode == WACOM_MODE_WACOM)
+             ret = usb_wacom_poll(s, data, length);
+         break;
++    case HID_GET_IDLE:
++        ret = 1;
++        data[0] = s->idle;
++        break;
+     case HID_SET_IDLE:
++        s->idle = (uint8_t) (value >> 8);
+         ret = 0;
+         break;
+     default:
+@@ -369,6 +375,9 @@
+     switch (p->pid) {
+     case USB_TOKEN_IN:
+         if (p->devep == 1) {
++            if (!(s->changed || s->idle))
++                return USB_RET_NAK;
++            s->changed = 0;
+             if (s->mode == WACOM_MODE_HID)
+                 ret = usb_mouse_poll(s, p->data, p->len);
+             else if (s->mode == WACOM_MODE_WACOM)
+@@ -399,7 +408,6 @@
+     s = qemu_mallocz(sizeof(USBWacomState));
+     s->dev.speed = USB_SPEED_FULL;
+     s->dev.handle_packet = usb_generic_handle_packet;
+-
+     s->dev.handle_reset = usb_wacom_handle_reset;
+     s->dev.handle_control = usb_wacom_handle_control;
+     s->dev.handle_data = usb_wacom_handle_data;
+@@ -407,6 +415,7 @@
+ 
+     pstrcpy(s->dev.devname, sizeof(s->dev.devname),
+             "QEMU PenPartner Tablet");
++    s->changed = 1;
+ 
+     return (USBDevice *) s;
+ }

meta/packages/qemu/qemu_git.bb

@@ -13,7 +13,8 @@ SRC_URI = "\
     file://fix-dirent.patch;patch=1 \
     file://fix-nogl.patch;patch=1 \
     file://zlibsearch.patch;patch=1 \
-    file://qemugl-allow-glxcontext-release.patch;patch=1 "
+    file://qemugl-allow-glxcontext-release.patch;patch=1 \
+    file://2ca2078e287174522e3a6229618947d3d285b8c0.patch;patch=1"
 
 S = "${WORKDIR}/git"
 

meta/packages/udev/udev-141/igep0020b/local.rules

@@ -0,0 +1,34 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# Media automounting
+SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
+SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
+
+# Handle network interface setup
+SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
+SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
+
+# The first rtc device is symlinked to /dev/rtc
+KERNEL=="rtc0", SYMLINK+="rtc"
+
+# The first framebuffer is symlinked to /dev/fb
+KERNEL=="fb0",  SYMLINK+="fb"
+
+# Try and modprobe for drivers for new hardware
+ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# Create a symlink to any touchscreen input device
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"

meta/packages/udev/udev-141/local.rules

@@ -28,4 +28,6 @@ KERNEL=="rtc0", SYMLINK+="rtc"
 ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
 
 # Create a symlink to any touchscreen input device
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+# Need to use ../ so the eventX can find the parent inputX modalias which is a directory above
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{../modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+

meta/packages/udev/udev-145/local.rules

@@ -28,4 +28,6 @@ KERNEL=="rtc0", SYMLINK+="rtc"
 ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
 
 # Create a symlink to any touchscreen input device
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+# Need to use ../ so the eventX can find the parent inputX modalias which is a directory above
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{../modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+

meta/packages/udev/udev_141.bb

@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
 
-PR = "r4"
+PR = "r6"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
@@ -66,4 +66,4 @@ do_install_append_h2200() {
 
 do_stage () {
 	autotools_stage_all
-}
+}

meta/packages/udev/udev_145.bb

@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://run.rules \

meta/packages/xorg-lib/libxcalibrate/fix-xcb.patch

@@ -0,0 +1,27 @@
+There is no extra reply data and if we say not to disgard it, xcb
+throws fatal asserts.
+
+RP - 26/11/09
+
+Index: git/xcalibrate.c
+===================================================================
+--- git.orig/xcalibrate.c	2009-11-26 08:11:48.000000000 +0000
++++ git/xcalibrate.c	2009-11-26 08:09:55.000000000 +0000
+@@ -216,7 +216,7 @@
+   req->reqType = info->codes->major_opcode;
+   req->xCalibrateReqType = X_XCalibrateRawMode;
+   req->on = enable;
+-  if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) 
++  if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) 
+     {
+       UnlockDisplay (dpy);
+       SyncHandle ();
+@@ -240,7 +240,7 @@
+   req->xCalibrateReqType = X_XCalibrateScreenToCoord;
+   req->x = *x;
+   req->y = *y;
+-  if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) 
++  if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) 
+     {
+       UnlockDisplay (dpy);
+       SyncHandle ();

meta/packages/xorg-lib/libxcalibrate_git.bb

@@ -4,8 +4,10 @@ DESCRIPTION = "	Touchscreen calibration client library"
 LICENSE = "BSD-X"
 DEPENDS = "virtual/libx11 calibrateproto libxext"
 PV = "0.0+git${SRCPV}"
+PR = "r1"
 
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git \
+           file://fix-xcb.patch;patch=1"
 
 S = "${WORKDIR}/git"
 

poky-init-build-env

@@ -21,7 +21,6 @@
 
 if test x"$0" = x"./poky-init-build-env"; then
    echo "Error: Run via '. ./poky-init-build-env'"
-   return
 else
    . ./scripts/poky-env-internal
 fi

scripts/poky-qemu-internal

@@ -90,7 +90,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm
     QEMU=qemu-system-arm
     if [ "$TYPE" = "ext3" ]; then
         KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet -no-reboot"
+        QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet -no-reboot -force-pointer -show-cursor"
     fi
     if [ "$TYPE" = "nfs" ]; then
         if [ "x$HDIMAGE" = "x" ]; then
@@ -101,7 +101,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm
             return
         fi
         KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -usb -usbdevice wacom-tablet -no-reboot"
+        QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -usb -usbdevice wacom-tablet -no-reboot -force-pointer -show-cursor"
     fi
 	if [ "$MACHINE" = "qemuarmv6" ]; then
 		QEMUOPTIONS="$QEMUOPTIONS -cpu arm1136"
@@ -126,7 +126,7 @@ if [ "$MACHINE" = "qemux86" ]; then
             return
         fi
         KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="-vga std $QEMU_NETWORK_CMD"
+        QEMUOPTIONS="-vga vmware $QEMU_NETWORK_CMD -enable-gl"
     fi
 fi
 

scripts/runqemu

@@ -30,7 +30,7 @@ if [ "x$1" = "x" ]; then
     echo "Run as $0 MACHINE IMAGETYPE ZIMAGE IMAGEFILE"
     echo "where:"
     echo "  MACHINE - the machine to emulate (qemuarm, qemux86)"
-    echo "  IMAGETYPE - the type of image to run (ext2, nfs) (default: ext2)"
+    echo "  IMAGETYPE - the type of image to run (ext3, nfs) (default: ext3)"
     echo "  ZIMAGE - the kernel to use (optional)"
     echo "  IMAGEFILE - the image file/location to use (optional)"
     exit 1
@@ -134,7 +134,7 @@ if [ "$MACHINE" = "qemux86" ]; then
     if [ "$TYPE" = "ext3" ]; then
         if [ "x$HDIMAGE" = "x" ]; then
             T=$BUILDDIR/tmp/deploy/images
-            findimage $T qemux86 ext3 "molbin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-minimal"
+            findimage $T qemux86 ext3 "moblin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-minimal"
         fi
     fi
     CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin