[OE-core] [PATCH 1/1] qemu: add PACKAGECONFIG for vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng

[Hongxu Jia]

On 11/26/2013 08:19 PM, Richard Purdie wrote:
> On Sat, 2013-11-02 at 14:52 +0800, Hongxu Jia wrote:
>> Use PACKAGECONFIG to explicitly address vnc, libcurl, nss, uuid, curses, gtk+,
>> libcap-ng dependencies rather than tested by configure.
>>
>> It avoided potential errors while multiple builds shared a common state_cache.
>>
>> Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
>> ---
>>   meta/recipes-devtools/qemu/qemu.inc | 19 ++++++++++++++++---
>>   1 file changed, 16 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
>> index 1b861d7..be0495a 100644
>> --- a/meta/recipes-devtools/qemu/qemu.inc
>> +++ b/meta/recipes-devtools/qemu/qemu.inc
>> @@ -28,10 +28,9 @@ SRC_URI_append_class-native = "\
>>       file://fix-libcap-header-issue-on-some-distro.patch \
>>       "
>>   
>> -EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --disable-curl --disable-vnc-jpeg --disable-bluez --with-system-pixman --extra-cflags='${CFLAGS}'"
>> +EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --audio-drv-list=oss,alsa --disable-bluez --with-system-pixman --extra-cflags='${CFLAGS}'"
>>   
>> -EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \
>> -				--disable-curl \
>> +EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror \
>>   				"
>>   export LIBTOOL="${HOST_SYS}-libtool"
>>   
>> @@ -80,9 +79,23 @@ do_install_append() {
>>   }
>>   # END of qemu-mips workaround
>>   
>> +# Disable the following PACKAGECONFIG varflag by default. Such as graphics is
>> +# disabled for qemu-native, if you need to enable some of them for qemu-native,
>> +# set PACKAGECONFIG_pn-qemu-native += "varflag1 varflag2" in local.conf
>>   PACKAGECONFIG ??= ""
>>   PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr,"
>>   PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio,"
>> +PACKAGECONFIG[vnc-tls] = "--enable-vnc --enable-vnc-tls,--disable-vnc-tls, gnutls,"
>> +PACKAGECONFIG[vnc-ws] = "--enable-vnc --enable-vnc-ws,--disable-vnc-ws, gnutls,"
>> +PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl,"
>> +PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg,"
>> +PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng,"
>> +PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,libcurl,"
>> +PACKAGECONFIG[nss] = "--enable-smartcard-nss,--disable-smartcard-nss,nss,"
>> +PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux,"
>> +PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,"
>> +PACKAGECONFIG[gtk+] = "--enable-gtk,--disable-gtk,gtk+ libvte,"
>> +PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
>>   
>>   # Qemu target will not build in world build for ARM or Mips
>>   BROKEN_qemuarm = "1"
> I merged this however I notice there are "yet more" floating
> dependencies since sdl is floating (at least).
>
> For sdl, can we add the PACKAGECONFIG option however also add an entry
> to local.conf.sample which documents how to enable sdl for qemu-native?

Got it, I will work on it.

//Hongxu


> I suspect that is the option most people are using to make runqemu
> useful. We may also want to have the option of assuming libsdl-native is
> provided since otherwise we end up in the tangled world of GL support
> and we don't want to build our own libsdl-native in most cases.
>
> Cheers,
>
> Richard
>
>
>
>