diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-08-09 19:08:38 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-08-09 19:08:38 +0000 |
| commit | 8f4687c84c6d540d27bf9bcbdb5360226320e3e3 (patch) | |
| tree | d968e49c13d58f95f48286d7c4df1e7b213770c5 | |
| parent | 3d50b7edb31bf209381c1e674de930332091587b (diff) | |
| download | openembedded-core-8f4687c84c6d540d27bf9bcbdb5360226320e3e3.tar.gz openembedded-core-8f4687c84c6d540d27bf9bcbdb5360226320e3e3.tar.bz2 openembedded-core-8f4687c84c6d540d27bf9bcbdb5360226320e3e3.tar.xz openembedded-core-8f4687c84c6d540d27bf9bcbdb5360226320e3e3.zip | |
qemu: Work around bad system futex headers
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2478 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/qemu/files/workaround_bad_futex_headers.patch | 25 | ||||
| -rw-r--r-- | meta/packages/qemu/qemu_cvs.bb | 3 |
2 files changed, 27 insertions, 1 deletions
diff --git a/meta/packages/qemu/files/workaround_bad_futex_headers.patch b/meta/packages/qemu/files/workaround_bad_futex_headers.patch new file mode 100644 index 000000000..cc122ebdb --- /dev/null +++ b/meta/packages/qemu/files/workaround_bad_futex_headers.patch @@ -0,0 +1,25 @@ +--- + linux-user/syscall.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +Index: qemu/linux-user/syscall.c +=================================================================== +--- qemu.orig/linux-user/syscall.c 2007-08-09 20:28:06.000000000 +0100 ++++ qemu/linux-user/syscall.c 2007-08-09 20:28:41.000000000 +0100 +@@ -61,7 +61,15 @@ + #define tchars host_tchars /* same as target */ + #define ltchars host_ltchars /* same as target */ + +-#include <linux/futex.h> ++#define FUTEX_WAIT 0 ++#define FUTEX_WAKE 1 ++#define FUTEX_FD 2 ++#define FUTEX_REQUEUE 3 ++#define FUTEX_CMP_REQUEUE 4 ++#define FUTEX_WAKE_OP 5 ++#define FUTEX_LOCK_PI 6 ++#define FUTEX_UNLOCK_PI 7 ++ + #include <linux/termios.h> + #include <linux/unistd.h> + #include <linux/utsname.h> diff --git a/meta/packages/qemu/qemu_cvs.bb b/meta/packages/qemu/qemu_cvs.bb index 29d68438a..ddad39c6c 100644 --- a/meta/packages/qemu/qemu_cvs.bb +++ b/meta/packages/qemu/qemu_cvs.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" DEPENDS = "zlib" PV = "0.9.0+cvs${SRCDATE}" -PR = "r3" +PR = "r4" FILESDIR = "${WORKDIR}" @@ -32,6 +32,7 @@ SRC_URI = "\ file://qemu-0.9.0-nptl.patch;patch=1 \ file://qemu-0.9.0-nptl-update.patch;patch=1 \ file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \ + file://workaround_bad_futex_headers.patch;patch=1 \ file://fix_segfault.patch;patch=1" # svn://svn.o-hand.com/repos/misc/trunk/qemu-packaging/qemu;module=debian;proto=http;srcdate=20070119 \ |