qemu: remove the leftover --enable-qemu-agent option

[feed/packages.git] / utils / qemu / Makefile

diff --git a/utils/qemu/Makefile b/utils/qemu/Makefile
index a7806d1cfb86eccb3793d0f7a3ed3fbafb73a630..75042103ea68429bdb5d4d31926bd0852624f443 100644 (file)
--- a/utils/qemu/Makefile
+++ b/utils/qemu/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qemu
-PKG_VERSION:=2.4.1
+PKG_VERSION:=2.5.0
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://wiki.qemu-project.org/download/
-PKG_SOURCE_MD5SUM:=a895e93ec1dafc34bc64ed676f0d55a6
+PKG_SOURCE_MD5SUM:=f469f2330bbe76e3e39db10e9ac4f8db
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE tcg/LICENSE
 PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
@@ -42,13 +42,27 @@ CONFIGURE_ARGS:=$(filter-out        \
        --disable-nls           \
        , $(CONFIGURE_ARGS))
 
-# Building qemu-ga alone does not require zlib
-CONFIGURE_ARGS+=                       \
+# Building qemu-ga alone does not require zlib, pixman
+#
+# --disable-tools to disable building pixman which will fail at the moment on
+#  octeon mips64 target.
+CONFIGURE_ARGS +=                      \
        --cross-prefix=$(TARGET_CROSS)  \
-       --host-cc=$(HOSTCC)             \
+       --host-cc="$(HOSTCC)"           \
        --target-list=''                \
        --disable-zlib-test             \
-       --enable-guest-agent
+       --disable-tools                 \
+       --without-pixman
+
+ifneq ($(CONFIG_PACKAGE_qemu-ga),)
+CONFIGURE_ARGS += --enable-guest-agent
+endif
+
+MAKE_VARS += V=s
+
+define Build/Compile
+       $(if $(CONFIG_PACKAGE_qemu-ga),$(call Build/Compile/Default,qemu-ga))
+endef
 
 define Package/qemu-ga/install
        $(INSTALL_DIR) $(1)/usr/bin