summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/qemu/files/fix-configure-checks.patch10
-rw-r--r--meta/recipes-devtools/qemu/files/relocatable_sdk.patch16
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc2
-rw-r--r--meta/recipes-devtools/qemu/qemu_1.4.0.bb (renamed from meta/recipes-devtools/qemu/qemu_1.3.1.bb)6
4 files changed, 16 insertions, 18 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
8 8
9Upstream-Status: Inappropriate [embedded specific] 9Upstream-Status: Inappropriate [embedded specific]
10 10
11Index: qemu-1.2.0/configure 11Index: qemu-1.4.0/configure
12=================================================================== 12===================================================================
13--- qemu-1.2.0.orig/configure 2012-09-05 07:03:06.000000000 -0700 13--- qemu-1.4.0.orig/configure 2013-02-15 15:05:35.000000000 -0800
14+++ qemu-1.2.0/configure 2012-09-06 13:55:07.007793823 -0700 14+++ qemu-1.4.0/configure 2013-02-25 13:44:17.915273181 -0800
15@@ -281,6 +281,7 @@ 15@@ -286,6 +286,7 @@
16 QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" 16 QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
17 QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" 17 QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
18 QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu" 18 QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include"
19+QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS" 19+QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS"
20 if test "$debug_info" = "yes"; then 20 if test "$debug_info" = "yes"; then
21 CFLAGS="-g $CFLAGS" 21 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).
6 6
7Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> 7Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
8 8
9Index: qemu-1.2.0/i386.ld 9Index: qemu-1.4.0/ldscripts/i386.ld
10=================================================================== 10===================================================================
11--- qemu-1.2.0.orig/i386.ld 11--- qemu-1.4.0.orig/ldscripts/i386.ld 2013-02-15 15:05:35.000000000 -0800
12+++ qemu-1.2.0/i386.ld 12+++ qemu-1.4.0/ldscripts/i386.ld 2013-02-28 22:55:36.138816418 -0800
13@@ -8,7 +8,7 @@ SECTIONS 13@@ -8,7 +8,7 @@
14 { 14 {
15 /* Read-only sections, merged into text segment: */ 15 /* Read-only sections, merged into text segment: */
16 . = 0x60000000 + SIZEOF_HEADERS; 16 . = 0x60000000 + SIZEOF_HEADERS;
@@ -19,11 +19,11 @@ Index: qemu-1.2.0/i386.ld
19 .hash : { *(.hash) } 19 .hash : { *(.hash) }
20 .dynsym : { *(.dynsym) } 20 .dynsym : { *(.dynsym) }
21 .dynstr : { *(.dynstr) } 21 .dynstr : { *(.dynstr) }
22Index: qemu-1.2.0/x86_64.ld 22Index: qemu-1.4.0/ldscripts/x86_64.ld
23=================================================================== 23===================================================================
24--- qemu-1.2.0.orig/x86_64.ld 24--- qemu-1.4.0.orig/ldscripts/x86_64.ld 2013-02-15 15:05:35.000000000 -0800
25+++ qemu-1.2.0/x86_64.ld 25+++ qemu-1.4.0/ldscripts/x86_64.ld 2013-02-28 22:55:36.138816418 -0800
26@@ -6,7 +6,7 @@ SECTIONS 26@@ -6,7 +6,7 @@
27 { 27 {
28 /* Read-only sections, merged into text segment: */ 28 /* Read-only sections, merged into text segment: */
29 . = 0x60000000 + SIZEOF_HEADERS; 29 . = 0x60000000 + SIZEOF_HEADERS;
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index eb60d43344..5616a06335 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -32,7 +32,7 @@ SRC_URI_append_class-nativesdk = "\
32 file://relocatable_sdk.patch \ 32 file://relocatable_sdk.patch \
33 " 33 "
34 34
35EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370 ${SDL} --disable-curl --disable-vnc-jpeg --disable-bluez --with-system-pixman --disable-smartcard" 35EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370 ${SDL} --disable-curl --disable-vnc-jpeg --disable-bluez --with-system-pixman"
36 36
37EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ 37EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \
38 --disable-curl \ 38 --disable-curl \
diff --git a/meta/recipes-devtools/qemu/qemu_1.3.1.bb b/meta/recipes-devtools/qemu/qemu_1.4.0.bb
index c04b2be9f9..009cd78337 100644
--- a/meta/recipes-devtools/qemu/qemu_1.3.1.bb
+++ b/meta/recipes-devtools/qemu/qemu_1.4.0.bb
@@ -4,7 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" 4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
5 5
6SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" 6SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2"
7SRC_URI[md5sum] = "5dbc6c22f47efca71dfaae0dd80dcf9e" 7SRC_URI[md5sum] = "78f13b774814b6b7ebcaf4f9b9204318"
8SRC_URI[sha256sum] = "3772e7ef0c9b4178195edcf90e711f12ba123f465fcf09fb43b56bdacaca0eaf" 8SRC_URI[sha256sum] = "066297ed77408fb7588889c271a85cf3c259ad55c939315988e6062d7708eda8"
9
10PR = "r0"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 02:34:59 +0000