Add patch to remove include <linux/compiler.h> as it isn't in edgy, and isn't

required.
  --This line, and those below, will be ignored--

A    qemu/files/compiler.patch
M    qemu/qemu_cvs.bb

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@781 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/qemu/files/compiler.patch b/meta/packages/qemu/files/compiler.patch
new file mode 100644 (file)
index 0000000..dad18b3
--- /dev/null
+++ b/meta/packages/qemu/files/compiler.patch
@@ -0,0 +1,10 @@
+--- qemu/usb-linux.c~  2006-07-19 19:06:15.000000000 +0100
++++ qemu/usb-linux.c   2006-10-02 12:49:00.000000000 +0100
+@@ -26,7 +26,6 @@
+ #if defined(__linux__)
+ #include <dirent.h>
+ #include <sys/ioctl.h>
+-#include <linux/compiler.h>
+ #include <linux/usbdevice_fs.h>
+ #include <linux/version.h>
+ 

diff --git a/meta/packages/qemu/qemu_cvs.bb b/meta/packages/qemu/qemu_cvs.bb
index 43097c12858f52dd283ca1414ac425afe898f647..a5cf98633c9345f10b2ff69cac974becee4d673e 100644 (file)
--- a/meta/packages/qemu/qemu_cvs.bb
+++ b/meta/packages/qemu/qemu_cvs.bb
@@ -1,11 +1,13 @@
 LICENSE = "GPL"
 PV = "0.8.2+cvs${SRCDATE}"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \
            file://configure.patch;patch=1    \
           file://arm_nptl.patch;patch=1     \
           file://pl110_rgb-r0.patch;patch=1 \
-          file://qemu-pci-irq-sharing.patch;patch=1 \  
+          file://qemu-pci-irq-sharing.patch;patch=1 \
+          file://compiler.patch;patch=1 \
           file://qemu-usb-wacom-0.8.2.patch;patch=1"
 
 S = "${WORKDIR}/qemu"