qemu: Make 20071121 the default version and cleanup various file locations and recipes

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3305 311d38ba-8fff-0310-9ca6-ca027cbcb966

31 files changed, 7 insertions, 8 deletions

diff --git a/meta/packages/qemu/files/02_snapshot_use_tmpdir.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/02_snapshot_use_tmpdir.patch
index bd955b6db..bd955b6db 100644
--- a/meta/packages/qemu/files/02_snapshot_use_tmpdir.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/02_snapshot_use_tmpdir.patch
diff --git a/meta/packages/qemu/files/03_machines_list_no_error.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/03_machines_list_no_error.patch
index 73f31550f..73f31550f 100644
--- a/meta/packages/qemu/files/03_machines_list_no_error.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/03_machines_list_no_error.patch
diff --git a/meta/packages/qemu/files/04_do_not_print_rtc_freq_if_ok.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/04_do_not_print_rtc_freq_if_ok.patch
index 1575cbce6..1575cbce6 100644
--- a/meta/packages/qemu/files/04_do_not_print_rtc_freq_if_ok.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/04_do_not_print_rtc_freq_if_ok.patch
diff --git a/meta/packages/qemu/files/05_non-fatal_if_linux_hd_missing.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/05_non-fatal_if_linux_hd_missing.patch
index b7c4732f2..b7c4732f2 100644
--- a/meta/packages/qemu/files/05_non-fatal_if_linux_hd_missing.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/05_non-fatal_if_linux_hd_missing.patch
diff --git a/meta/packages/qemu/files/06_exit_segfault.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/06_exit_segfault.patch
index 447c3550b..447c3550b 100644
--- a/meta/packages/qemu/files/06_exit_segfault.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/06_exit_segfault.patch
diff --git a/meta/packages/qemu/files/10_signal_jobs.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/10_signal_jobs.patch
index 794a53867..794a53867 100644
--- a/meta/packages/qemu/files/10_signal_jobs.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/10_signal_jobs.patch
diff --git a/meta/packages/qemu/files/11_signal_sigaction.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/11_signal_sigaction.patch
index 5446efc56..5446efc56 100644
--- a/meta/packages/qemu/files/11_signal_sigaction.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/11_signal_sigaction.patch
diff --git a/meta/packages/qemu/files/12_signal_powerpc_support.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/12_signal_powerpc_support.patch
index d8d419878..d8d419878 100644
--- a/meta/packages/qemu/files/12_signal_powerpc_support.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/12_signal_powerpc_support.patch
diff --git a/meta/packages/qemu/files/22_net_tuntap_stall.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/22_net_tuntap_stall.patch
index e9b31dfe4..e9b31dfe4 100644
--- a/meta/packages/qemu/files/22_net_tuntap_stall.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/22_net_tuntap_stall.patch
diff --git a/meta/packages/qemu/files/30_syscall_ipc.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/30_syscall_ipc.patch
index 3dc58102a..3dc58102a 100644
--- a/meta/packages/qemu/files/30_syscall_ipc.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/30_syscall_ipc.patch
diff --git a/meta/packages/qemu/files/31_syscalls.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/31_syscalls.patch
index 3878079f1..3878079f1 100644
--- a/meta/packages/qemu/files/31_syscalls.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/31_syscalls.patch
diff --git a/meta/packages/qemu/files/32_syscall_sysctl.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/32_syscall_sysctl.patch
index d175cf96b..d175cf96b 100644
--- a/meta/packages/qemu/files/32_syscall_sysctl.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/32_syscall_sysctl.patch
diff --git a/meta/packages/qemu/files/33_syscall_ppc_clone.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/33_syscall_ppc_clone.patch
index a71f8b194..a71f8b194 100644
--- a/meta/packages/qemu/files/33_syscall_ppc_clone.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/33_syscall_ppc_clone.patch
diff --git a/meta/packages/qemu/files/39_syscall_fadvise64.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/39_syscall_fadvise64.patch
index 0a7f4c48d..0a7f4c48d 100644
--- a/meta/packages/qemu/files/39_syscall_fadvise64.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/39_syscall_fadvise64.patch
diff --git a/meta/packages/qemu/files/41_arm_fpa_sigfpe.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/41_arm_fpa_sigfpe.patch
index d579dbc66..d579dbc66 100644
--- a/meta/packages/qemu/files/41_arm_fpa_sigfpe.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/41_arm_fpa_sigfpe.patch
diff --git a/meta/packages/qemu/files/52_ne2000_return.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/52_ne2000_return.patch
index f0316c804..f0316c804 100644
--- a/meta/packages/qemu/files/52_ne2000_return.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/52_ne2000_return.patch
diff --git a/meta/packages/qemu/files/61_safe_64bit_int.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/61_safe_64bit_int.patch
index 553e57623..553e57623 100644
--- a/meta/packages/qemu/files/61_safe_64bit_int.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/61_safe_64bit_int.patch
diff --git a/meta/packages/qemu/files/63_sparc_build.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/63_sparc_build.patch
index 32a6bc0ee..32a6bc0ee 100644
--- a/meta/packages/qemu/files/63_sparc_build.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/63_sparc_build.patch
diff --git a/meta/packages/qemu/files/64_ppc_asm_constraints.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/64_ppc_asm_constraints.patch
index e4858b79d..e4858b79d 100644
--- a/meta/packages/qemu/files/64_ppc_asm_constraints.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/64_ppc_asm_constraints.patch
diff --git a/meta/packages/qemu/files/65_kfreebsd.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/65_kfreebsd.patch
index ea060811a..ea060811a 100644
--- a/meta/packages/qemu/files/65_kfreebsd.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/65_kfreebsd.patch
diff --git a/meta/packages/qemu/files/66_tls_ld.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/66_tls_ld.patch
index 54e02eff8..54e02eff8 100644
--- a/meta/packages/qemu/files/66_tls_ld.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/66_tls_ld.patch
diff --git a/meta/packages/qemu/files/91-oh-sdl-cursor.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/91-oh-sdl-cursor.patch
index 5280a5bd4..5280a5bd4 100644
--- a/meta/packages/qemu/files/91-oh-sdl-cursor.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/91-oh-sdl-cursor.patch
diff --git a/meta/packages/qemu/files/93-oh-pl110-rgb.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/93-oh-pl110-rgb.patch
index 4911ac131..4911ac131 100644
--- a/meta/packages/qemu/files/93-oh-pl110-rgb.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/93-oh-pl110-rgb.patch
diff --git a/meta/packages/qemu/files/fix_segfault.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/fix_segfault.patch
index 976c75cd6..976c75cd6 100644
--- a/meta/packages/qemu/files/fix_segfault.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/fix_segfault.patch
diff --git a/meta/packages/qemu/files/qemu-0.9.0-nptl-update.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/qemu-0.9.0-nptl-update.patch
index 869acba2c..869acba2c 100644
--- a/meta/packages/qemu/files/qemu-0.9.0-nptl-update.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/qemu-0.9.0-nptl-update.patch
diff --git a/meta/packages/qemu/files/qemu-0.9.0-nptl.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/qemu-0.9.0-nptl.patch
index fc7b0cfa4..fc7b0cfa4 100644
--- a/meta/packages/qemu/files/qemu-0.9.0-nptl.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/qemu-0.9.0-nptl.patch
diff --git a/meta/packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/qemu-amd64-32b-mapping-0.9.0.patch
index d9303e346..d9303e346 100644
--- a/meta/packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/qemu-amd64-32b-mapping-0.9.0.patch
diff --git a/meta/packages/qemu/files/workaround_bad_futex_headers.patch b/meta/packages/qemu/qemu-0.9.0+cvs20070613/workaround_bad_futex_headers.patch
index cc122ebdb..cc122ebdb 100644
--- a/meta/packages/qemu/files/workaround_bad_futex_headers.patch
+++ b/meta/packages/qemu/qemu-0.9.0+cvs20070613/workaround_bad_futex_headers.patch
diff --git a/meta/packages/qemu/qemu_20070613.bb b/meta/packages/qemu/qemu_20070613.bb
index 590641b84..9d4a5c605 100644
--- a/meta/packages/qemu/qemu_20070613.bb
+++ b/meta/packages/qemu/qemu_20070613.bb
@@ -4,6 +4,7 @@ SRCDATE = "20070613"
 PV = "0.9.0+cvs${SRCDATE}"
 PR = "r4"
 
+FILESPATH = "${FILE_DIRNAME}/qemu-${PV}:${FILE_DIRNAME}/files"
 FILESDIR = "${WORKDIR}"
 
 SRC_URI = "\
@@ -47,9 +48,9 @@ SRC_URI = "\
 
 S = "${WORKDIR}/qemu"
 
-#EXTRA_OECONF = "--disable-sdl"
-#EXTRA_OECONF = "--disable-gfx-check --target-list=arm-linux-user"
-EXTRA_OECONF = "--disable-gfx-check"
+#EXTRA_OECONF += "--disable-sdl"
+#EXTRA_OECONF += "--target-list=arm-linux-user"
+EXTRA_OECONF += "--disable-gfx-check"
 
 inherit autotools
 
diff --git a/meta/packages/qemu/qemu_20071121.bb b/meta/packages/qemu/qemu_20071121.bb
index 34924fe18..66662f0d0 100644
--- a/meta/packages/qemu/qemu_20071121.bb
+++ b/meta/packages/qemu/qemu_20071121.bb
@@ -4,8 +4,6 @@ SRCDATE = "20071121"
 PV = "0.9.0+cvs${SRCDATE}"
 PR = "r1"
 
-DEFAULT_PREFERENCE = "-1"
-
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}:${FILE_DIRNAME}/files"
 FILESDIR = "${WORKDIR}"
 
diff --git a/meta/packages/qemu/qemu_cvs.bb b/meta/packages/qemu/qemu_cvs.bb
index c64875bda..137262ca2 100644
--- a/meta/packages/qemu/qemu_cvs.bb
+++ b/meta/packages/qemu/qemu_cvs.bb
@@ -47,9 +47,9 @@ SRC_URI = "\
 
 S = "${WORKDIR}/qemu"
 
-#EXTRA_OECONF = "--disable-sdl"
-#EXTRA_OECONF = "--disable-gfx-check --target-list=arm-linux-user"
-EXTRA_OECONF = "--disable-gfx-check"
+#EXTRA_OECONF += "--disable-sdl"
+#EXTRA_OECONF += "--target-list=arm-linux-user"
+EXTRA_OECONF += "--disable-gfx-check"
 
 inherit autotools