diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2016-12-06 14:50:53 +0800 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2016-12-11 21:32:22 -0600 |
| commit | 83f0cfb71ae21cc3fad4916e00b19ab4f3c669dd (patch) | |
| tree | 90d5e2775907f541415a505a41cfa781b7eacf20 /utils/qemu/Makefile | |
| parent | 3e4d616a74db777e25f6f9605d1bf203c07b220e (diff) | |
qemu: bump to version 2.6.2
- use CXX_DEPENDS instead of explictly requiring libstdcpp
- use PKG_INSTALL_DIR for packaging qemu-ga
- explicitly --disable-docs
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Diffstat (limited to 'utils/qemu/Makefile')
| -rw-r--r-- | utils/qemu/Makefile | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/utils/qemu/Makefile b/utils/qemu/Makefile index 75042103e..15fa72b17 100644 --- a/utils/qemu/Makefile +++ b/utils/qemu/Makefile @@ -8,15 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qemu -PKG_VERSION:=2.5.0 +PKG_VERSION:=2.6.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://wiki.qemu-project.org/download/ -PKG_SOURCE_MD5SUM:=f469f2330bbe76e3e39db10e9ac4f8db +PKG_SOURCE_MD5SUM:=bdf1f3d0c177ebeb35a079a4bc3fc74e PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE tcg/LICENSE PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com> +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/qemu-ga @@ -24,13 +27,15 @@ define Package/qemu-ga CATEGORY:=Utilities TITLE:=QEMU Guest Agent URL:=http://www.qemu.org - DEPENDS:=+glib2 +libpthread +libstdcpp +librt + DEPENDS:=+glib2 +libpthread $(CXX_DEPENDS) +librt endef define Package/qemu-ga/description This package contains the QEMU Guest Agent daemon endef +PKG_CONFIG_DEPENDS += CONFIG_PACKAGE_qemu-ga + # QEMU configure script does not recognize these options CONFIGURE_ARGS:=$(filter-out \ --target=% \ @@ -50,9 +55,10 @@ CONFIGURE_ARGS += \ --cross-prefix=$(TARGET_CROSS) \ --host-cc="$(HOSTCC)" \ --target-list='' \ + --disable-docs \ --disable-zlib-test \ --disable-tools \ - --without-pixman + --without-pixman \ ifneq ($(CONFIG_PACKAGE_qemu-ga),) CONFIGURE_ARGS += --enable-guest-agent @@ -66,7 +72,7 @@ endef define Package/qemu-ga/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/qemu-ga $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qemu-ga $(1)/usr/bin $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/qemu-ga.init $(1)/etc/init.d/qemu-ga $(INSTALL_DIR) $(1)/etc/hotplug.d/virtio-ports |