diff options
-rw-r--r-- | meta/conf/distro/poky.conf | 2 | ||||
-rw-r--r-- | meta/packages/qemu/qemu-native_20070613.bb | 18 | ||||
-rw-r--r-- | meta/packages/qemu/qemu_20070613.bb | 55 | ||||
-rw-r--r-- | meta/packages/qemu/qemu_cvs.bb | 1 |
4 files changed, 74 insertions, 2 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 683299936d..cee86ffb11 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
@@ -92,8 +92,6 @@ SRCREV_pn-screenshot ?= "266" | |||
92 | SRCDATE_xcalibrateext ?= "20051101" | 92 | SRCDATE_xcalibrateext ?= "20051101" |
93 | SRCREV_pn-libfakekey ?= "1270" | 93 | SRCREV_pn-libfakekey ?= "1270" |
94 | SRCDATE_xcalibrate ?= "20060312" | 94 | SRCDATE_xcalibrate ?= "20060312" |
95 | SRCDATE_qemu ?= "20070613" | ||
96 | SRCDATE_qemu-native ?= "20070613" | ||
97 | SRCDATE_oprofile ?= "20070807" | 95 | SRCDATE_oprofile ?= "20070807" |
98 | SRCREV_pn-oprofileui ?= "127" | 96 | SRCREV_pn-oprofileui ?= "127" |
99 | SRCREV_pn-zaurusd ?= "273" | 97 | SRCREV_pn-zaurusd ?= "273" |
diff --git a/meta/packages/qemu/qemu-native_20070613.bb b/meta/packages/qemu/qemu-native_20070613.bb new file mode 100644 index 0000000000..03a433b232 --- /dev/null +++ b/meta/packages/qemu/qemu-native_20070613.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require qemu_${PV}.bb | ||
2 | inherit native | ||
3 | DEPENDS = "zlib-native" | ||
4 | prefix = "${STAGING_DIR}/${BUILD_SYS}" | ||
5 | |||
6 | python __anonymous() { | ||
7 | from bb import which, data | ||
8 | |||
9 | path = data.getVar('PATH', d) | ||
10 | oeconf = data.getVar('EXTRA_OECONF', d) or '' | ||
11 | if len(which(path, 'gcc-3.4')) != 0: | ||
12 | data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc-3.4", d) | ||
13 | elif len(which(path, 'gcc34')) != 0: | ||
14 | data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc34", d) | ||
15 | elif len(which(path, 'gcc-3.3')) != 0: | ||
16 | data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc-3.3", d) | ||
17 | #data.setVarFlag('PKG_CONFIG_PATH', 'unexport', '1', d) | ||
18 | } | ||
diff --git a/meta/packages/qemu/qemu_20070613.bb b/meta/packages/qemu/qemu_20070613.bb new file mode 100644 index 0000000000..590641b84f --- /dev/null +++ b/meta/packages/qemu/qemu_20070613.bb | |||
@@ -0,0 +1,55 @@ | |||
1 | LICENSE = "GPL" | ||
2 | DEPENDS = "zlib" | ||
3 | SRCDATE = "20070613" | ||
4 | PV = "0.9.0+cvs${SRCDATE}" | ||
5 | PR = "r4" | ||
6 | |||
7 | FILESDIR = "${WORKDIR}" | ||
8 | |||
9 | SRC_URI = "\ | ||
10 | cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \ | ||
11 | file://02_snapshot_use_tmpdir.patch;patch=1;pnum=0 \ | ||
12 | file://03_machines_list_no_error.patch;patch=1;pnum=0 \ | ||
13 | file://04_do_not_print_rtc_freq_if_ok.patch;patch=1;pnum=1 \ | ||
14 | file://05_non-fatal_if_linux_hd_missing.patch;patch=1;pnum=1 \ | ||
15 | file://06_exit_segfault.patch;patch=1;pnum=0 \ | ||
16 | file://10_signal_jobs.patch;patch=1;pnum=0 \ | ||
17 | file://11_signal_sigaction.patch;patch=1;pnum=0 \ | ||
18 | file://12_signal_powerpc_support.patch;patch=1;pnum=1 \ | ||
19 | file://22_net_tuntap_stall.patch;patch=1;pnum=0 \ | ||
20 | file://31_syscalls.patch;patch=1;pnum=0 \ | ||
21 | file://32_syscall_sysctl.patch;patch=1;pnum=0 \ | ||
22 | file://33_syscall_ppc_clone.patch;patch=1;pnum=0 \ | ||
23 | file://39_syscall_fadvise64.patch;patch=1;pnum=0 \ | ||
24 | file://41_arm_fpa_sigfpe.patch;patch=1;pnum=0 \ | ||
25 | file://52_ne2000_return.patch;patch=1;pnum=1 \ | ||
26 | file://61_safe_64bit_int.patch;patch=1;pnum=0 \ | ||
27 | file://63_sparc_build.patch;patch=1;pnum=0 \ | ||
28 | file://64_ppc_asm_constraints.patch;patch=1;pnum=1 \ | ||
29 | file://65_kfreebsd.patch;patch=1;pnum=0 \ | ||
30 | file://66_tls_ld.patch;patch=1;pnum=0 \ | ||
31 | file://91-oh-sdl-cursor.patch;patch=1;pnum=0 \ | ||
32 | file://93-oh-pl110-rgb.patch;patch=1;pnum=0 \ | ||
33 | file://qemu-0.9.0-nptl.patch;patch=1 \ | ||
34 | file://qemu-0.9.0-nptl-update.patch;patch=1 \ | ||
35 | file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \ | ||
36 | file://workaround_bad_futex_headers.patch;patch=1 \ | ||
37 | file://fix_segfault.patch;patch=1" | ||
38 | |||
39 | # svn://svn.o-hand.com/repos/misc/trunk/qemu-packaging/qemu;module=debian;proto=http;srcdate=20070119 \ | ||
40 | # file://debian/patches/21_net_soopts.patch;patch=1;pnum=0 \ | ||
41 | # file://debian/patches/35_syscall_sockaddr.patch;patch=1;pnum=0 \ | ||
42 | # file://debian/patches/43_arm_cpustate.patch;patch=1;pnum=0 \ | ||
43 | # file://debian/patches/62_linux_boot_nasm.patch;patch=1;pnum=0 \ | ||
44 | # file://debian/patches/67_ppc_ftbfs.patch;patch=1;pnum=0 \ | ||
45 | # file://debian/patches/80_ui_curses.patch;patch=1;pnum=0 \ | ||
46 | # file://debian/patches/96-x.patch;patch=1" | ||
47 | |||
48 | S = "${WORKDIR}/qemu" | ||
49 | |||
50 | #EXTRA_OECONF = "--disable-sdl" | ||
51 | #EXTRA_OECONF = "--disable-gfx-check --target-list=arm-linux-user" | ||
52 | EXTRA_OECONF = "--disable-gfx-check" | ||
53 | |||
54 | inherit autotools | ||
55 | |||
diff --git a/meta/packages/qemu/qemu_cvs.bb b/meta/packages/qemu/qemu_cvs.bb index ddad39c6c0..c64875bda6 100644 --- a/meta/packages/qemu/qemu_cvs.bb +++ b/meta/packages/qemu/qemu_cvs.bb | |||
@@ -3,6 +3,7 @@ DEPENDS = "zlib" | |||
3 | PV = "0.9.0+cvs${SRCDATE}" | 3 | PV = "0.9.0+cvs${SRCDATE}" |
4 | PR = "r4" | 4 | PR = "r4" |
5 | 5 | ||
6 | DEFAULT_PREFERENCE = "-1" | ||
6 | FILESDIR = "${WORKDIR}" | 7 | FILESDIR = "${WORKDIR}" |
7 | 8 | ||
8 | SRC_URI = "\ | 9 | SRC_URI = "\ |