summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin@buglabs.net>2009-02-24 15:06:06 +0100
committerMarcin Juszkiewicz <marcin@buglabs.net>2009-02-24 15:06:50 +0100
commitc2f46bd918111e186accd34a7bf5b3110683cf59 (patch)
treecd8f408418b2d7547990ba16e15c18dc40671649
parent71e368844fe5c8ad53b53ecc06cfdad6257d8c28 (diff)
downloadpoky-c2f46bd918111e186accd34a7bf5b3110683cf59.tar.gz
poky-c2f46bd918111e186accd34a7bf5b3110683cf59.tar.bz2
poky-c2f46bd918111e186accd34a7bf5b3110683cf59.zip
qemu: unbreak building with linux-libc-headers 2.6.28
-rw-r--r--meta/packages/qemu/qemu-0.9.1/fix-dirent.h-location.diff21
-rw-r--r--meta/packages/qemu/qemu_0.9.1.bb3
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/packages/qemu/qemu-0.9.1/fix-dirent.h-location.diff b/meta/packages/qemu/qemu-0.9.1/fix-dirent.h-location.diff
new file mode 100644
index 0000000000..6257000dff
--- /dev/null
+++ b/meta/packages/qemu/qemu-0.9.1/fix-dirent.h-location.diff
@@ -0,0 +1,21 @@
+On Debian 'sid' systems there is no linux/dirent.h header when
+linux-libc-headers 2.6.28 are installed.
+
+---
+ linux-user/syscall.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- qemu-0.9.1.orig/linux-user/syscall.c
++++ qemu-0.9.1/linux-user/syscall.c
+@@ -75,10 +75,11 @@
+ #include <linux/utsname.h>
+ #include <linux/cdrom.h>
+ #include <linux/hdreg.h>
+ #include <linux/soundcard.h>
+ #include <linux/dirent.h>
++#include <dirent.h>
+ #include <linux/kd.h>
+
+ #include "qemu.h"
+ #include "qemu_spinlock.h"
+
diff --git a/meta/packages/qemu/qemu_0.9.1.bb b/meta/packages/qemu/qemu_0.9.1.bb
index 69266ab154..909f05dd1a 100644
--- a/meta/packages/qemu/qemu_0.9.1.bb
+++ b/meta/packages/qemu/qemu_0.9.1.bb
@@ -1,6 +1,6 @@
LICENSE = "GPL"
DEPENDS = "zlib"
-PR = "r7"
+PR = "r8"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
FILESDIR = "${WORKDIR}"
@@ -34,6 +34,7 @@ SRC_URI = "\
file://writev_fix.patch;patch=1 \
file://configure_symlinkpath_fix.patch;patch=1 \
file://disable-error-in-configure.patch;patch=1 \
+ file://fix-dirent.h-location.diff;patch=1 \
file://no-strip.patch;patch=1"
S = "${WORKDIR}/qemu-${PV}"