Skip to contentSkip to conversation

package/qemu: add vnc support

PATCH New Jared Bents 2 participants 3 messages Jul 14, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 package/qemu: add vnc support

update to add vnc support to qemu if libvncserver is selected

--
v1->v2: Update to handle suboptions for vnc support.

---
 package/qemu/qemu.mk | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)
package/qemu/qemu.mk +22 -1
index c013e6ffa0..ff234622f4 100644
@@ -98,6 +98,28 @@ else
 QEMU_OPTS += --disable-libusb
 endif
 
+
+ifeq ($(BR2_PACKAGE_LIBVNCSERVER),y)
+QEMU_OPTS += \
+	--enable-vnc \
+	--disable-vnc-sasl
+QEMU_DEPENDENCIES += libvncserver
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+QEMU_OPTS += --enable-vnc-png
+QEMU_DEPENDENCIES += libpng
+else
+QEMU_OPTS += --disable-vnc-png
+endif
+ifeq ($(BR2_PACKAGE_JPEG),y)
+QEMU_OPTS += --enable-vnc-jpeg
+QEMU_DEPENDENCIES += jpeg
+else
+QEMU_OPTS += --disable-vnc-jpeg
+endif
+else
+QEMU_OPTS += --disable-vnc
+endif
+
 ifeq ($(BR2_PACKAGE_NETTLE),y)
 QEMU_OPTS += --enable-nettle
 QEMU_DEPENDENCIES += nettle
@@ -140,7 +162,6 @@ define QEMU_CONFIGURE_CMDS
 			--disable-bsd-user \
 			--disable-containers \
 			--disable-xen \
-			--disable-vnc \
 			--disable-virtfs \
 			--disable-brlapi \
 			--disable-curses \
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 2/2 package/qemu: add usb-redir support

update to add usb-redir support to qemu if usbredir is enabled

--
v1->v2: N/A. Update in v2 was to handle suboptions for vnc support.
No change for usb-redir support.

---
 package/qemu/qemu.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/qemu/qemu.mk +7 -1
index ff234622f4..d08dcdc057 100644
@@ -141,6 +141,13 @@ else
 QEMU_OPTS += --disable-spice
 endif
 
+ifeq ($(BR2_PACKAGE_USBREDIR),y)
+QEMU_OPTS += --enable-usb-redir
+QEMU_DEPENDENCIES += usbredir
+else
+QEMU_OPTS += --disable-usb-redir
+endif
+
 # Override CPP, as it expects to be able to call it like it'd
 # call the compiler.
 define QEMU_CONFIGURE_CMDS
@@ -173,7 +180,6 @@ define QEMU_CONFIGURE_CMDS
 			--disable-docs \
 			--disable-rbd \
 			--disable-libiscsi \
-			--disable-usb-redir \
 			--disable-strip \
 			--disable-sparse \
 			--disable-mpath \
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 1/2 package/qemu: add vnc support

In reply to Jared Bents
Quoted 9 lines · On Tue, 14 Jul 2020 11:57:49 -0500 Jared Bents…

update to add vnc support to qemu if libvncserver is selected

--
v1->v2: Update to handle suboptions for vnc support.

---
 package/qemu/qemu.mk | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

Both applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com