[oe-commits] Khem Raj : qemu: Add recipes for 0.14.0 release and remove 0.13.0
git version control
git at git.openembedded.org
Mon Mar 14 19:15:24 UTC 2011
Module: openembedded.git
Branch: master
Commit: 4b56b7396ce9e1c0207b410e611f669f0f773e00
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4b56b7396ce9e1c0207b410e611f669f0f773e00
Author: Khem Raj <raj.khem at gmail.com>
Date: Mon Mar 14 12:06:54 2011 -0700
qemu: Add recipes for 0.14.0 release and remove 0.13.0
0.13.0 was not DP and was not parallel buildable, could
not boot SH4 and segfaulted in locale generation. Therefore
its removed.
0.14 is preferred over 0.12.5 by default
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
recipes/qemu/qemu-0.13.0/leftover.patch | 25 --------------------
recipes/qemu/qemu-0.13.0/parallel-build.patch | 16 ------------
..._syscalls_on_arches_that_do_not_use_UID16.patch | 0
.../91-oh-sdl-cursor.patch | 0
.../fallback.to.safe.mmap_min_addr.patch | 0
.../fix_baum_c_compilation.patch | 0
recipes/qemu/qemu-0.14.0/leftover.patch | 15 ++++++++++++
recipes/qemu/qemu-0.14.0/parallel-build.patch | 25 ++++++++++++++++++++
recipes/qemu/{qemu_0.13.0.bb => qemu_0.14.0.bb} | 10 +++----
9 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/recipes/qemu/qemu-0.13.0/leftover.patch b/recipes/qemu/qemu-0.13.0/leftover.patch
deleted file mode 100644
index c840d3e..0000000
--- a/recipes/qemu/qemu-0.13.0/leftover.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: qemu-0.10.0/hw/pc.c
-===================================================================
---- qemu-0.10.0.orig/hw/pc.c 2009-03-07 13:47:27.000000000 +0100
-+++ qemu-0.10.0/hw/pc.c 2009-03-07 13:47:30.000000000 +0100
-@@ -390,7 +390,8 @@
- case 0x400:
- case 0x401:
- fprintf(stderr, "BIOS panic at rombios.c, line %d\n", val);
-- exit(1);
-+ /* according to documentation, these can be safely ignored */
-+ break;
- case 0x402:
- case 0x403:
- #ifdef DEBUG_BIOS
-@@ -413,8 +414,9 @@
- /* LGPL'ed VGA BIOS messages */
- case 0x501:
- case 0x502:
-+ /* according to documentation, these can be safely ignored */
- fprintf(stderr, "VGA BIOS panic, line %d\n", val);
-- exit(1);
-+ break;
- case 0x500:
- case 0x503:
- #ifdef DEBUG_BIOS
diff --git a/recipes/qemu/qemu-0.13.0/parallel-build.patch b/recipes/qemu/qemu-0.13.0/parallel-build.patch
deleted file mode 100644
index eb4afcf..0000000
--- a/recipes/qemu/qemu-0.13.0/parallel-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch is taken from
-https://bugs.gentoo.org/show_bug.cgi?id=343175
--Khem
-
---- a/rules.mak 2010-11-03 01:05:54.765852993 +0000
-+++ b/rules.mak 2010-11-03 01:06:54.234107851 +0000
-@@ -14,7 +14,7 @@
- # Flags for dependency generation
- QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
-
--%.o: %.c
-+%.o: %.c $(GENERATED_HEADERS)
- $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@")
-
- %.o: %.S
-
diff --git a/recipes/qemu/qemu-0.13.0/03_fix_syscalls_on_arches_that_do_not_use_UID16.patch b/recipes/qemu/qemu-0.14.0/03_fix_syscalls_on_arches_that_do_not_use_UID16.patch
similarity index 100%
rename from recipes/qemu/qemu-0.13.0/03_fix_syscalls_on_arches_that_do_not_use_UID16.patch
rename to recipes/qemu/qemu-0.14.0/03_fix_syscalls_on_arches_that_do_not_use_UID16.patch
diff --git a/recipes/qemu/qemu-0.13.0/91-oh-sdl-cursor.patch b/recipes/qemu/qemu-0.14.0/91-oh-sdl-cursor.patch
similarity index 100%
rename from recipes/qemu/qemu-0.13.0/91-oh-sdl-cursor.patch
rename to recipes/qemu/qemu-0.14.0/91-oh-sdl-cursor.patch
diff --git a/recipes/qemu/qemu-0.13.0/fallback.to.safe.mmap_min_addr.patch b/recipes/qemu/qemu-0.14.0/fallback.to.safe.mmap_min_addr.patch
similarity index 100%
rename from recipes/qemu/qemu-0.13.0/fallback.to.safe.mmap_min_addr.patch
rename to recipes/qemu/qemu-0.14.0/fallback.to.safe.mmap_min_addr.patch
diff --git a/recipes/qemu/qemu-0.13.0/fix_baum_c_compilation.patch b/recipes/qemu/qemu-0.14.0/fix_baum_c_compilation.patch
similarity index 100%
rename from recipes/qemu/qemu-0.13.0/fix_baum_c_compilation.patch
rename to recipes/qemu/qemu-0.14.0/fix_baum_c_compilation.patch
diff --git a/recipes/qemu/qemu-0.14.0/leftover.patch b/recipes/qemu/qemu-0.14.0/leftover.patch
new file mode 100644
index 0000000..b50cf35
--- /dev/null
+++ b/recipes/qemu/qemu-0.14.0/leftover.patch
@@ -0,0 +1,15 @@
+Index: qemu-0.14.0/hw/pc.c
+===================================================================
+--- qemu-0.14.0.orig/hw/pc.c
++++ qemu-0.14.0/hw/pc.c
+@@ -536,8 +536,9 @@ static void bochs_bios_write(void *opaqu
+ /* LGPL'ed VGA BIOS messages */
+ case 0x501:
+ case 0x502:
++ /* according to documentation, these can be safely ignored */
+ fprintf(stderr, "VGA BIOS panic, line %d\n", val);
+- exit(1);
++ break;
+ case 0x500:
+ case 0x503:
+ #ifdef DEBUG_BIOS
diff --git a/recipes/qemu/qemu-0.14.0/parallel-build.patch b/recipes/qemu/qemu-0.14.0/parallel-build.patch
new file mode 100644
index 0000000..2b77624
--- /dev/null
+++ b/recipes/qemu/qemu-0.14.0/parallel-build.patch
@@ -0,0 +1,25 @@
+This patch is taken from
+https://bugs.gentoo.org/show_bug.cgi?id=343175
+-Khem
+
+Index: qemu-0.14.0/rules.mak
+===================================================================
+--- qemu-0.14.0.orig/rules.mak
++++ qemu-0.14.0/rules.mak
+@@ -14,13 +14,13 @@ MAKEFLAGS += -rR
+ # Flags for dependency generation
+ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
+
+-%.o: %.c
++%.o: %.c $(GENERATED_HEADERS)
+ $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@")
+
+-%.o: %.S
++%.o: %.S $(GENERATED_HEADERS)
+ $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@")
+
+-%.o: %.m
++%.o: %.m $(GENERATED_HEADERS)
+ $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@")
+
+ LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(1) $(LIBS)," LINK $(TARGET_DIR)$@")
diff --git a/recipes/qemu/qemu_0.13.0.bb b/recipes/qemu/qemu_0.14.0.bb
similarity index 76%
rename from recipes/qemu/qemu_0.13.0.bb
rename to recipes/qemu/qemu_0.14.0.bb
index 29ef11d..a74cfdf 100644
--- a/recipes/qemu/qemu_0.13.0.bb
+++ b/recipes/qemu/qemu_0.14.0.bb
@@ -1,7 +1,6 @@
LICENSE = "GPL"
DEPENDS = "zlib ncurses gnutls"
-PR = "r2"
-DEFAULT_PREFERENCE = "-1"
+PR = "r0"
SRC_URI = "\
http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz \
file://leftover.patch \
@@ -10,8 +9,9 @@ SRC_URI = "\
file://fallback.to.safe.mmap_min_addr.patch \
file://parallel-build.patch \
"
-SRC_URI[md5sum] = "397a0d665da8ba9d3b9583629f3d6421"
-SRC_URI[sha256sum] = "1e6f5851b05cea6e377c835f4668408d4124cfb845f9948d922808743c5fd877"
+SRC_URI[md5sum] = "f9d145d5c09de9f0984ffe9bd1229970"
+SRC_URI[sha256sum] = "ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108"
+
BBCLASSEXTEND="native"
S = "${WORKDIR}/qemu-${PV}"
@@ -23,8 +23,6 @@ EXTRA_OECONF_append_virtclass-native = " --extra-cflags="-I${STAGING_INCDIR_NATI
inherit autotools
-PARALLEL_MAKE = ""
-
do_configure() {
${S}/configure --prefix=${prefix} ${EXTRA_OECONF}
}
More information about the Openembedded-commits
mailing list