summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-11-11 13:22:02 +0100
committerKoen Kooi <koen@openembedded.org>2008-11-11 13:22:02 +0100
commit656b1a0a1edf97897d0c3e4b6cf9506d3f337f86 (patch)
treea71a17f3cfe3547fad3fce13dac64edeb1055066
parent4a70a7201b0e8be41f68c3c8659061d672f8d5b4 (diff)
parentb599dd011042785fb8435265d4720ca10d2d0dfc (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
-rw-r--r--packages/qemu/qemu-0.9.1+svn/fix_dirent_h_include.patch12
-rw-r--r--packages/qemu/qemu_svn.bb5
2 files changed, 15 insertions, 2 deletions
diff --git a/packages/qemu/qemu-0.9.1+svn/fix_dirent_h_include.patch b/packages/qemu/qemu-0.9.1+svn/fix_dirent_h_include.patch
new file mode 100644
index 0000000000..1320422aa7
--- /dev/null
+++ b/packages/qemu/qemu-0.9.1+svn/fix_dirent_h_include.patch
@@ -0,0 +1,12 @@
+--- a/linux-user/syscall.c~ 2008-11-10 18:39:25.000000000 -0200
++++ b/linux-user/syscall.c 2008-11-10 18:39:25.000000000 -0200
+@@ -76,8 +76,8 @@
+ #include <linux/cdrom.h>
+ #include <linux/hdreg.h>
+ #include <linux/soundcard.h>
+-#include <linux/dirent.h>
+ #include <linux/kd.h>
++#include <dirent.h>
+
+ #include "qemu.h"
+ #include "qemu_spinlock.h"
diff --git a/packages/qemu/qemu_svn.bb b/packages/qemu/qemu_svn.bb
index 6e52a1513f..e8d9883c74 100644
--- a/packages/qemu/qemu_svn.bb
+++ b/packages/qemu/qemu_svn.bb
@@ -1,7 +1,7 @@
LICENSE = "GPL"
DEPENDS = "zlib"
PV = "0.9.1+svnr${SRCREV}"
-PR = "r12"
+PR = "r13"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-0.9.1+svn/"
@@ -33,7 +33,8 @@ SRC_URI = "\
file://fix_brk.patch;patch=1 \
file://fix_protection_bits.patch;patch=1 \
file://revert_arm_tcg.patch.gz;patch=1;minrev=4242 \
- file://qemu-n800-support.patch;patch=1"
+ file://qemu-n800-support.patch;patch=1 \
+ file://fix_dirent_h_include.patch;patch=1"
S = "${WORKDIR}/trunk"