Skip to contentSkip to conversation

qemu: add PACKAGECONFIG for vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng

PATCH In review Hongxu Jia 2 participants 4 messages Nov 2, 2013 – Nov 27, 2013

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

v3 cover qemu: add PACKAGECONFIG for vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng

Change in V2: Improve floating dependencies as many as possible;

Chnage in V3: Add comments to make it clear that all PACKAGECONFIG varflags
disabled by default and how to enable them by setting in local.conf;

The following changes since commit 523f2a9ea970713fb775bc48f84b67420b1106a0:

cross-canadian: Improve comment (2013-10-30 18:01:34 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-qemu-nss
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-qemu-nss

Hongxu Jia (1):
qemu: add PACKAGECONFIG for vnc,libcurl,nss,uuid,curses,gtk+,libcap-ng

 meta/recipes-devtools/qemu/qemu.inc | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH v3 1/1 qemu: add PACKAGECONFIG for vnc, libcurl, nss, uuid, curses, gtk+, libcap-ng

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.

---
 meta/recipes-devtools/qemu/qemu.inc | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
meta/recipes-devtools/qemu/qemu.inc +16 -3
index 1b861d7..be0495a 100644
@@ -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"
Signature · 1 line
1.8.1.2
#2 lore raw
Quoted 41 lines · Hongxu Jia

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.

---
 meta/recipes-devtools/qemu/qemu.inc | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
meta/recipes-devtools/qemu/qemu.inc +9 -3
index 1b861d7..be0495a 100644
@@ -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,"

meta/recipes-devtools/qemu/qemu.inc do_install_append() { · line 101

Quoted 10 lines
meta/recipes-devtools/qemu/qemu.inc +7 -0
+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? 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

author
#3 lore raw
Quoted 50 lines · Richard Purdie
Quoted 49 lines · Hongxu Jia

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.

---
  meta/recipes-devtools/qemu/qemu.inc | 19 ++++++++++++++++---
  1 file changed, 16 insertions(+), 3 deletions(-)
meta/recipes-devtools/qemu/qemu.inc +16 -3
index 1b861d7..be0495a 100644
@@ -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,"
 
Quoted 7 lines

meta/recipes-devtools/qemu/qemu.inc do_install_append() { · line 101

Quoted 2 lines
meta/recipes-devtools/qemu/qemu.inc +0 -0
  # 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

Quoted 12 lines

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