diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-22 12:13:26 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-22 12:13:26 +0100 |
commit | d977cb25e5072558c3c98a5c169d5d91f0e55fe2 (patch) | |
tree | fb297971e55bfed2087577a303c3f5a4ffee9ba6 /meta-extras/packages/qemu | |
parent | 3073a732141c9b4f2621025ad946c39090834e79 (diff) | |
download | poky-d977cb25e5072558c3c98a5c169d5d91f0e55fe2.tar.gz |
meta-extras: Remove obsolete android goldfish code
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-extras/packages/qemu')
-rw-r--r-- | meta-extras/packages/qemu/qemu-android-native.bb | 25 | ||||
-rw-r--r-- | meta-extras/packages/qemu/qemu-android-native/fixes.patch | 45 |
2 files changed, 0 insertions, 70 deletions
diff --git a/meta-extras/packages/qemu/qemu-android-native.bb b/meta-extras/packages/qemu/qemu-android-native.bb deleted file mode 100644 index 169d790864..0000000000 --- a/meta-extras/packages/qemu/qemu-android-native.bb +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | LICENSE = "GPL" | ||
2 | DEPENDS = "zlib-native" | ||
3 | PV = "0.0-rc20" | ||
4 | PR = "r0" | ||
5 | |||
6 | SRC_URI = "http://android.googlecode.com/files/android-emulator-m3-rc20.tar.bz2 \ | ||
7 | file://fixes.patch;patch=1" | ||
8 | |||
9 | S = "${WORKDIR}/android-emulator-20071111/qemu" | ||
10 | |||
11 | EXTRA_OECONF = "--disable-gfx-check --target-list=arm-softmmu --enable-nand --enable-skins --enable-trace --enable-shaper --use-sdl-config=${prefix}/hackedsdl/bin/sdl-config --disable-user --disable-kqemu --enable-sdl --static-png --static-sdl" | ||
12 | |||
13 | inherit autotools | ||
14 | inherit native | ||
15 | |||
16 | do_unfubar () { | ||
17 | chmod -R u+w ${WORKDIR}/ | ||
18 | cd ${WORKDIR}/android-emulator-20071111/sdl | ||
19 | configure --prefix=${prefix}/hackedsdl | ||
20 | make | ||
21 | make install | ||
22 | } | ||
23 | |||
24 | addtask unfubar after do_unpack before do_patch | ||
25 | |||
diff --git a/meta-extras/packages/qemu/qemu-android-native/fixes.patch b/meta-extras/packages/qemu/qemu-android-native/fixes.patch deleted file mode 100644 index 5d16b6061d..0000000000 --- a/meta-extras/packages/qemu/qemu-android-native/fixes.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | Index: qemu/linux-user/elfload.c | ||
2 | =================================================================== | ||
3 | --- qemu.orig/linux-user/elfload.c 2007-11-12 06:58:42.000000000 +0000 | ||
4 | +++ qemu/linux-user/elfload.c 2007-11-12 20:41:37.000000000 +0000 | ||
5 | @@ -12,6 +12,10 @@ | ||
6 | #include "qemu.h" | ||
7 | #include "disas.h" | ||
8 | |||
9 | +#ifndef O_BINARY | ||
10 | +#define O_BINARY 0 | ||
11 | +#endif | ||
12 | + | ||
13 | /* this flag is uneffective under linux too, should be deleted */ | ||
14 | #ifndef MAP_DENYWRITE | ||
15 | #define MAP_DENYWRITE 0 | ||
16 | Index: qemu/linux-user/linuxload.c | ||
17 | =================================================================== | ||
18 | --- qemu.orig/linux-user/linuxload.c 2007-11-12 06:58:42.000000000 +0000 | ||
19 | +++ qemu/linux-user/linuxload.c 2007-11-12 20:35:16.000000000 +0000 | ||
20 | @@ -12,6 +12,10 @@ | ||
21 | |||
22 | #define NGROUPS 32 | ||
23 | |||
24 | +#ifndef O_BINARY | ||
25 | +#define O_BINARY 0 | ||
26 | +#endif | ||
27 | + | ||
28 | /* ??? This should really be somewhere else. */ | ||
29 | void memcpy_to_target(target_ulong dest, const void *src, | ||
30 | unsigned long len) | ||
31 | Index: qemu/hw/qfb_fs.c | ||
32 | =================================================================== | ||
33 | --- qemu.orig/hw/qfb_fs.c 2007-11-12 06:58:41.000000000 +0000 | ||
34 | +++ qemu/hw/qfb_fs.c 2007-11-12 20:59:34.000000000 +0000 | ||
35 | @@ -14,6 +14,10 @@ | ||
36 | #include <sys/xattr.h> | ||
37 | #include <errno.h> | ||
38 | |||
39 | +#ifndef O_BINARY | ||
40 | +#define O_BINARY 0 | ||
41 | +#endif | ||
42 | + | ||
43 | /* all mount paths */ | ||
44 | static int next_path_index = 0; | ||
45 | static struct mount_path mount_paths[MAX_MOUNT_PATHS]; | ||