insane.bbclass: Skip arch check for Cross Canadian

Signed-off-by: Joshua Lock <josh@linux.intel.com>

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/introduction.xml

@@ -178,12 +178,12 @@ provided by the principal developer and maintainer of Poky, <ulink url="http://o
 
         <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.tar.gz
+$ tar zxvf purple-3.2.tar.gz
+$ cd purple-3.2/
 $ source poky-init-build-env
 $ bitbake poky-image-sato
-$ runqemu qemuarm
+$ runqemu qemux86
 </literallayout>
         </para>
 

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-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"
 
 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/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/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/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