diff options
author | Ross Burton <ross@linux.intel.com> | 2008-11-10 17:43:32 +0000 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2008-11-11 11:11:56 +0000 |
commit | 5698e0be46718ac32888ae2ee13423d370018a07 (patch) | |
tree | 067d322cee003c3b506e7bcddd1693beb7e0f7f3 | |
parent | 13ee3030f337631f738379c9347279b6f42fda99 (diff) | |
download | poky-5698e0be46718ac32888ae2ee13423d370018a07.tar.gz |
Fix qemu build on 2.6.27
Linux 2.6.27 removed linux/dirent.h, which qemu was included. Change this to
include dirent.h.
-rw-r--r-- | meta/packages/qemu/qemu-0.9.1+svn/fix-dirent.patch | 20 | ||||
-rw-r--r-- | meta/packages/qemu/qemu_svn.bb | 5 |
2 files changed, 23 insertions, 2 deletions
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/fix-dirent.patch b/meta/packages/qemu/qemu-0.9.1+svn/fix-dirent.patch new file mode 100644 index 0000000000..9282ac4779 --- /dev/null +++ b/meta/packages/qemu/qemu-0.9.1+svn/fix-dirent.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Index: trunk/linux-user/syscall.c | ||
2 | =================================================================== | ||
3 | --- trunk.orig/linux-user/syscall.c 2008-11-10 10:58:07.000000000 +0000 | ||
4 | +++ trunk/linux-user/syscall.c 2008-11-10 11:00:37.000000000 +0000 | ||
5 | @@ -26,6 +26,7 @@ | ||
6 | #include <errno.h> | ||
7 | #include <unistd.h> | ||
8 | #include <fcntl.h> | ||
9 | +#include <dirent.h> | ||
10 | #include <time.h> | ||
11 | #include <sys/types.h> | ||
12 | #include <sys/ipc.h> | ||
13 | @@ -76,7 +77,6 @@ | ||
14 | #include <linux/cdrom.h> | ||
15 | #include <linux/hdreg.h> | ||
16 | #include <linux/soundcard.h> | ||
17 | -#include <linux/dirent.h> | ||
18 | #include <linux/kd.h> | ||
19 | |||
20 | #include "qemu.h" | ||
diff --git a/meta/packages/qemu/qemu_svn.bb b/meta/packages/qemu/qemu_svn.bb index 42cbc11a95..3de26cd397 100644 --- a/meta/packages/qemu/qemu_svn.bb +++ b/meta/packages/qemu/qemu_svn.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | LICENSE = "GPL" | 1 | LICENSE = "GPL" |
2 | DEPENDS = "zlib" | 2 | DEPENDS = "zlib" |
3 | PV = "0.9.1+svnr${SRCREV}" | 3 | PV = "0.9.1+svnr${SRCREV}" |
4 | PR = "r12" | 4 | PR = "r13" |
5 | 5 | ||
6 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-0.9.1+svn/" | 6 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-0.9.1+svn/" |
7 | 7 | ||
@@ -34,7 +34,8 @@ SRC_URI = "\ | |||
34 | file://fix_brk.patch;patch=1 \ | 34 | file://fix_brk.patch;patch=1 \ |
35 | file://fix_protection_bits.patch;patch=1 \ | 35 | file://fix_protection_bits.patch;patch=1 \ |
36 | file://revert_arm_tcg.patch.gz;patch=1;minrev=4242 \ | 36 | file://revert_arm_tcg.patch.gz;patch=1;minrev=4242 \ |
37 | file://qemu-n800-support.patch;patch=1" | 37 | file://qemu-n800-support.patch;patch=1 \ |
38 | file://fix-dirent.patch;patch=1" | ||
38 | 39 | ||
39 | S = "${WORKDIR}/trunk" | 40 | S = "${WORKDIR}/trunk" |
40 | 41 | ||