diff options
author | Marcin Juszkiewicz <marcin@buglabs.net> | 2009-02-24 15:06:06 +0100 |
---|---|---|
committer | Marcin Juszkiewicz <marcin@buglabs.net> | 2009-02-24 15:06:50 +0100 |
commit | c2f46bd918111e186accd34a7bf5b3110683cf59 (patch) | |
tree | cd8f408418b2d7547990ba16e15c18dc40671649 | |
parent | 71e368844fe5c8ad53b53ecc06cfdad6257d8c28 (diff) | |
download | poky-c2f46bd918111e186accd34a7bf5b3110683cf59.tar.gz |
qemu: unbreak building with linux-libc-headers 2.6.28
-rw-r--r-- | meta/packages/qemu/qemu-0.9.1/fix-dirent.h-location.diff | 21 | ||||
-rw-r--r-- | meta/packages/qemu/qemu_0.9.1.bb | 3 |
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 @@ | |||
1 | On Debian 'sid' systems there is no linux/dirent.h header when | ||
2 | linux-libc-headers 2.6.28 are installed. | ||
3 | |||
4 | --- | ||
5 | linux-user/syscall.c | 1 + | ||
6 | 1 file changed, 1 insertion(+) | ||
7 | |||
8 | --- qemu-0.9.1.orig/linux-user/syscall.c | ||
9 | +++ qemu-0.9.1/linux-user/syscall.c | ||
10 | @@ -75,10 +75,11 @@ | ||
11 | #include <linux/utsname.h> | ||
12 | #include <linux/cdrom.h> | ||
13 | #include <linux/hdreg.h> | ||
14 | #include <linux/soundcard.h> | ||
15 | #include <linux/dirent.h> | ||
16 | +#include <dirent.h> | ||
17 | #include <linux/kd.h> | ||
18 | |||
19 | #include "qemu.h" | ||
20 | #include "qemu_spinlock.h" | ||
21 | |||
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 @@ | |||
1 | LICENSE = "GPL" | 1 | LICENSE = "GPL" |
2 | DEPENDS = "zlib" | 2 | DEPENDS = "zlib" |
3 | PR = "r7" | 3 | PR = "r8" |
4 | 4 | ||
5 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" | 5 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" |
6 | FILESDIR = "${WORKDIR}" | 6 | FILESDIR = "${WORKDIR}" |
@@ -34,6 +34,7 @@ SRC_URI = "\ | |||
34 | file://writev_fix.patch;patch=1 \ | 34 | file://writev_fix.patch;patch=1 \ |
35 | file://configure_symlinkpath_fix.patch;patch=1 \ | 35 | file://configure_symlinkpath_fix.patch;patch=1 \ |
36 | file://disable-error-in-configure.patch;patch=1 \ | 36 | file://disable-error-in-configure.patch;patch=1 \ |
37 | file://fix-dirent.h-location.diff;patch=1 \ | ||
37 | file://no-strip.patch;patch=1" | 38 | file://no-strip.patch;patch=1" |
38 | 39 | ||
39 | S = "${WORKDIR}/qemu-${PV}" | 40 | S = "${WORKDIR}/qemu-${PV}" |