[OE-core] [OE-Core][PATCH] qemu: Upgrade to 1.4.0 release

[Khem Raj]

On Wed, Feb 27, 2013 at 5:36 PM, Saul Wold <sgw at linux.intel.com> wrote:
> On 02/26/2013 11:30 PM, Khem Raj wrote:
>>
>> Tested qemu on x86-64 target and qemu-native
>> no obvious problems seen in testing
>>
>> Signed-off-by: Khem Raj <raj.khem at gmail.com>
>> ---
>>   .../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%)
>>
>> diff --git a/meta/recipes-devtools/qemu/files/fix-configure-checks.patch
>> b/meta/recipes-devtools/qemu/files/fix-configure-checks.patch
>> index ef77c92..294c220 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/qemu.inc
>> b/meta/recipes-devtools/qemu/qemu.inc
>> index 6c44b31..2b60347 100644
>> --- a/meta/recipes-devtools/qemu/qemu.inc
>> +++ b/meta/recipes-devtools/qemu/qemu.inc
>> @@ -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?

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.