Skip to contentSkip to conversation

qemu: Upgrade to 1.4.0 release

PATCH Superseded Khem Raj 2 participants 3 messages Feb 27, 2013 – Feb 28, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 qemu: Upgrade to 1.4.0 release

Tested qemu on x86-64 target and qemu-native
no obvious problems seen in testing

---
 .../qemu/files/fix-configure-checks.patch          |   10 +++++-----
 meta/recipes-devtools/qemu/qemu.inc                |    2 +-
 .../qemu/{qemu_1.3.1.bb => qemu_1.4.0.bb}          |    6 ++----
 3 files changed, 8 insertions(+), 10 deletions(-)
 rename meta/recipes-devtools/qemu/{qemu_1.3.1.bb => qemu_1.4.0.bb} (62%)
meta/recipes-devtools/qemu/files/fix-configure-checks.patch +5 -5
index ef77c92..294c220 100644
@@ -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"
meta/recipes-devtools/qemu/qemu.inc +1 -1
index 6c44b31..2b60347 100644
@@ -32,7 +32,7 @@ SRC_URI_append_class-nativesdk = "\
     file://relocatable_sdk.patch \
     "
 
-EXTRA_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"
+EXTRA_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"
 
 EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \
 				--disable-curl \
meta/recipes-devtools/qemu/qemu_1.4.0.bb renamed from meta/recipes-devtools/qemu/qemu_1.3.1.bb +2 -4
similarity index 62%
rename from meta/recipes-devtools/qemu/qemu_1.3.1.bb
rename to meta/recipes-devtools/qemu/qemu_1.4.0.bb
index c04b2be..009cd78 100644
@@ -4,7 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
 
 SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2"
-SRC_URI[md5sum] = "5dbc6c22f47efca71dfaae0dd80dcf9e"
-SRC_URI[sha256sum] = "3772e7ef0c9b4178195edcf90e711f12ba123f465fcf09fb43b56bdacaca0eaf"
-
-PR = "r0"
+SRC_URI[md5sum] = "78f13b774814b6b7ebcaf4f9b9204318"
+SRC_URI[sha256sum] = "066297ed77408fb7588889c271a85cf3c259ad55c939315988e6062d7708eda8"
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 40 lines · Khem Raj

Tested qemu on x86-64 target and qemu-native
no obvious problems seen in testing

---
  .../qemu/files/fix-configure-checks.patch          |   10 +++++-----
  meta/recipes-devtools/qemu/qemu.inc                |    2 +-
  .../qemu/{qemu_1.3.1.bb => qemu_1.4.0.bb}          |    6 ++----
  3 files changed, 8 insertions(+), 10 deletions(-)

rename meta/recipes-devtools/qemu/{qemu_1.3.1.bb => qemu_1.4.0.bb} (62%)

meta/recipes-devtools/qemu/files/fix-configure-checks.patch +5 -5
index ef77c92..294c220 100644
@@ -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"
meta/recipes-devtools/qemu/qemu.inc +0 -0
index 6c44b31..2b60347 100644

meta/recipes-devtools/qemu/qemu.inc SRC_URI_append_class-nativesdk = "\ · line 36

Quoted 6 lines
meta/recipes-devtools/qemu/qemu.inc +1 -1
@@ -32,7 +32,7 @@ SRC_URI_append_class-nativesdk = "\
      file://relocatable_sdk.patch \
      "
 
-EXTRA_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"
+EXTRA_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"
 

Why did you remove the --disable-smartcard?

Quoted 10 lines
meta/recipes-devtools/qemu/qemu.inc +0 -0
  EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \
  				--disable-curl \
meta/recipes-devtools/qemu/qemu_1.4.0.bb renamed from meta/recipes-devtools/qemu/qemu_1.3.1.bb +0 -0
similarity index 62%
rename from meta/recipes-devtools/qemu/qemu_1.3.1.bb
rename to meta/recipes-devtools/qemu/qemu_1.4.0.bb
index c04b2be..009cd78 100644

meta/recipes-devtools/qemu/qemu_1.4.0.bb LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ · line 10

Quoted 7 lines
meta/recipes-devtools/qemu/qemu_1.4.0.bb renamed from meta/recipes-devtools/qemu/qemu_1.3.1.bb +0 -4
@@ -4,7 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                      file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
 
  SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2"
-SRC_URI[md5sum] = "5dbc6c22f47efca71dfaae0dd80dcf9e"
-SRC_URI[sha256sum] = "3772e7ef0c9b4178195edcf90e711f12ba123f465fcf09fb43b56bdacaca0eaf"
-
-PR = "r0"

Nice touch!

meta/recipes-devtools/qemu/qemu_1.4.0.bb LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ · line 8

Quoted 3 lines
meta/recipes-devtools/qemu/qemu_1.4.0.bb renamed from meta/recipes-devtools/qemu/qemu_1.3.1.bb +2 -0
+SRC_URI[md5sum] = "78f13b774814b6b7ebcaf4f9b9204318"
+SRC_URI[sha256sum] = "066297ed77408fb7588889c271a85cf3c259ad55c939315988e6062d7708eda8"

Sau!

author
#2 lore raw
Quoted 48 lines · Saul Wold
Quoted 47 lines · Khem Raj

Tested qemu on x86-64 target and qemu-native
no obvious problems seen in testing

---
  .../qemu/files/fix-configure-checks.patch          |   10 +++++-----
  meta/recipes-devtools/qemu/qemu.inc                |    2 +-
  .../qemu/{qemu_1.3.1.bb => qemu_1.4.0.bb}          |    6 ++----
  3 files changed, 8 insertions(+), 10 deletions(-)

rename meta/recipes-devtools/qemu/{qemu_1.3.1.bb => qemu_1.4.0.bb} (62%)

meta/recipes-devtools/qemu/files/fix-configure-checks.patch +4 -4
index ef77c92..294c220 100644
@@ -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"
meta/recipes-devtools/qemu/qemu.inc +0 -0
index 6c44b31..2b60347 100644
@@ -32,7 +32,7 @@ SRC_URI_append_class-nativesdk = "\
      file://relocatable_sdk.patch \
      "
 
Quoted 11 lines

meta/recipes-devtools/qemu/qemu.inc SRC_URI_append_class-nativesdk = "\

Quoted 9 lines
meta/recipes-devtools/qemu/qemu.inc +1 -7
-EXTRA_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"
+EXTRA_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"

Why did you remove the --disable-smartcard?

This option is gone in 1.4 and only softmmu version include usb.mak which will enable CONFIG_USB_SMARTCARD
and bring in the card emulation.