summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/files
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-02-28 23:01:51 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-05 12:29:45 +0000
commitf479201fffda617e3530967a75ab350739574b4b (patch)
tree9b3689a04630fe16d8945d6c3d2820a855a9b8ab /meta/recipes-devtools/qemu/files
parent97403b14765331c8c48bb570c6b98f2809214a9a (diff)
downloadopenembedded-core-contrib-f479201fffda617e3530967a75ab350739574b4b.tar.gz
qemu: Upgrade to 1.4.0 release
Tested qemu on x86-64 target and qemu-native no obvious problems seen in testing Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/qemu/files')
-rw-r--r--meta/recipes-devtools/qemu/files/fix-configure-checks.patch10
-rw-r--r--meta/recipes-devtools/qemu/files/relocatable_sdk.patch16
2 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-devtools/qemu/files/fix-configure-checks.patch b/meta/recipes-devtools/qemu/files/fix-configure-checks.patch
index ef77c92842..294c22019d 100644
--- a/meta/recipes-devtools/qemu/files/fix-configure-checks.patch
+++ b/meta/recipes-devtools/qemu/files/fix-configure-checks.patch
@@ -8,14 +8,14 @@ Patch from Paul Eggleton, Comments by RP 28/11/10
Upstream-Status: Inappropriate [embedded specific]
-Index: qemu-1.2.0/configure
+Index: qemu-1.4.0/configure
===================================================================
---- qemu-1.2.0.orig/configure 2012-09-05 07:03:06.000000000 -0700
-+++ qemu-1.2.0/configure 2012-09-06 13:55:07.007793823 -0700
-@@ -281,6 +281,7 @@
+--- qemu-1.4.0.orig/configure 2013-02-15 15:05:35.000000000 -0800
++++ qemu-1.4.0/configure 2013-02-25 13:44:17.915273181 -0800
+@@ -286,6 +286,7 @@
QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
- QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu"
+ QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include"
+QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS"
if test "$debug_info" = "yes"; then
CFLAGS="-g $CFLAGS"
diff --git a/meta/recipes-devtools/qemu/files/relocatable_sdk.patch b/meta/recipes-devtools/qemu/files/relocatable_sdk.patch
index 0a01a8a048..774a49c774 100644
--- a/meta/recipes-devtools/qemu/files/relocatable_sdk.patch
+++ b/meta/recipes-devtools/qemu/files/relocatable_sdk.patch
@@ -6,11 +6,11 @@ the new path (4096 is the maximum path length in Linux).
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
-Index: qemu-1.2.0/i386.ld
+Index: qemu-1.4.0/ldscripts/i386.ld
===================================================================
---- qemu-1.2.0.orig/i386.ld
-+++ qemu-1.2.0/i386.ld
-@@ -8,7 +8,7 @@ SECTIONS
+--- qemu-1.4.0.orig/ldscripts/i386.ld 2013-02-15 15:05:35.000000000 -0800
++++ qemu-1.4.0/ldscripts/i386.ld 2013-02-28 22:55:36.138816418 -0800
+@@ -8,7 +8,7 @@
{
/* Read-only sections, merged into text segment: */
. = 0x60000000 + SIZEOF_HEADERS;
@@ -19,11 +19,11 @@ Index: qemu-1.2.0/i386.ld
.hash : { *(.hash) }
.dynsym : { *(.dynsym) }
.dynstr : { *(.dynstr) }
-Index: qemu-1.2.0/x86_64.ld
+Index: qemu-1.4.0/ldscripts/x86_64.ld
===================================================================
---- qemu-1.2.0.orig/x86_64.ld
-+++ qemu-1.2.0/x86_64.ld
-@@ -6,7 +6,7 @@ SECTIONS
+--- qemu-1.4.0.orig/ldscripts/x86_64.ld 2013-02-15 15:05:35.000000000 -0800
++++ qemu-1.4.0/ldscripts/x86_64.ld 2013-02-28 22:55:36.138816418 -0800
+@@ -6,7 +6,7 @@
{
/* Read-only sections, merged into text segment: */
. = 0x60000000 + SIZEOF_HEADERS;