From a1776aef80c9c860a72d806f897c4cab1bb28137 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Fri, 23 Feb 2018 04:35:03 +0000
Subject: [PATCH] QEMU guest agent qemu-ga

---
 buildroot_config_fragment                          |  3 +++
 buildroot_config_fragment_x11                      |  1 -
 buildroot_override                                 |  1 +
 buildroot_patches/qemu-rm-with-system-pixman.patch | 12 ++++++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 buildroot_patches/qemu-rm-with-system-pixman.patch

diff --git a/buildroot_config_fragment b/buildroot_config_fragment
index 87dd9b0..d5ba558 100644
--- a/buildroot_config_fragment
+++ b/buildroot_config_fragment
@@ -3,6 +3,8 @@ BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="../busybox_config_fragment"
 BR2_PACKAGE_DHRYSTONE=y
 BR2_PACKAGE_KERNEL_MODULE=y
 BR2_PACKAGE_OVERRIDE_FILE="../buildroot_override"
+# For qemu-ga on guest. TODO: do something with it, and document it.
+BR2_PACKAGE_QEMU=y
 BR2_PACKAGE_STRACE=y
 BR2_ROOTFS_OVERLAY="../rootfs_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../rootfs_post_build_script"
@@ -10,6 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="../rootfs_post_image_script"
 BR2_ROOTFS_USERS_TABLES="../user_table"
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_EXT2=y
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 
 # Host GDB
 BR2_GDB_VERSION="7.11.1"
diff --git a/buildroot_config_fragment_x11 b/buildroot_config_fragment_x11
index 7ecfcdf..e5d403b 100644
--- a/buildroot_config_fragment_x11
+++ b/buildroot_config_fragment_x11
@@ -15,4 +15,3 @@ BR2_PACKAGE_XSERVER_XORG_SERVER=y
 BR2_PACKAGE_XTERM=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-BR2_USE_WCHAR=y
diff --git a/buildroot_override b/buildroot_override
index 501ffc3..cf57077 100644
--- a/buildroot_override
+++ b/buildroot_override
@@ -1,2 +1,3 @@
 HOST_QEMU_OVERRIDE_SRCDIR = ../qemu
 LINUX_OVERRIDE_SRCDIR = ../linux
+QEMU_OVERRIDE_SRCDIR = ../qemu
diff --git a/buildroot_patches/qemu-rm-with-system-pixman.patch b/buildroot_patches/qemu-rm-with-system-pixman.patch
new file mode 100644
index 0000000..42ab4f6
--- /dev/null
+++ b/buildroot_patches/qemu-rm-with-system-pixman.patch
@@ -0,0 +1,12 @@
+diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
+index f02df8bcc1..3b139bafa9 100644
+--- a/package/qemu/qemu.mk
++++ b/package/qemu/qemu.mk
+@@ -224,7 +224,6 @@ define QEMU_CONFIGURE_CMDS
+ 		./configure \
+ 			--prefix=/usr \
+ 			--cross-prefix=$(TARGET_CROSS) \
+-			--with-system-pixman \
+ 			--audio-drv-list= \
+ 			--enable-kvm \
+ 			--enable-attr \