diff options
Diffstat (limited to 'tools/qemu')
| -rw-r--r-- | tools/qemu/Makefile | 35 | ||||
| -rw-r--r-- | tools/qemu/patches/010-freebsd-fix.patch | 11 |
2 files changed, 20 insertions, 26 deletions
diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile index c0d587b243f..d63ab3482eb 100644 --- a/tools/qemu/Makefile +++ b/tools/qemu/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010 OpenWrt.org +# Copyright (C) 2010-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,26 +7,31 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qemu -PKG_VERSION:=0.13.0 +PKG_CPE_ID:=cpe:/a:qemu:qemu +PKG_VERSION:=0.14.1 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/qemu/ +PKG_SOURCE_URL:=@SAVANNAH/qemu PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MD5SUM:=397a0d665da8ba9d3b9583629f3d6421 +PKG_HASH:=33ceae3fbe516f2cbb151dc98d16c8ccfec74b1056674ad715e75a2f7fed45c3 include $(INCLUDE_DIR)/host-build.mk -HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs - -define Host/Configure - (cd $(HOST_BUILD_DIR); \ - CFLAGS="$(HOST_CFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" \ - $(HOST_CONFIGURE_CMD) \ - --extra-cflags="$(HOST_CFLAGS)" \ - --enable-uuid \ - ) -endef +HOST_CFLAGS += \ + -I$(STAGING_DIR_HOST)/include/e2fsprogs \ + -DAES_cbc_encrypt=QEMU_AES_cbc_encrypt \ + -DAES_decrypt=QEMU_AES_decrypt \ + -DAES_encrypt=QEMU_AES_encrypt \ + -DAES_set_decrypt_key=QEMU_AES_set_decrypt_key \ + -DAES_set_encrypt_key=QEMU_AES_set_encrypt_key + +HOST_CONFIGURE_VARS := \ + CFLAGS="$(HOST_CFLAGS)" \ + LDFLAGS="$(HOST_LDFLAGS)" + +HOST_CONFIGURE_ARGS := \ + --extra-cflags="$(HOST_CFLAGS)" \ + --enable-uuid define Host/Compile $(MAKE) -C $(HOST_BUILD_DIR) qemu-img diff --git a/tools/qemu/patches/010-freebsd-fix.patch b/tools/qemu/patches/010-freebsd-fix.patch deleted file mode 100644 index 1fc09120964..00000000000 --- a/tools/qemu/patches/010-freebsd-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/block/sheepdog.c -+++ b/block/sheepdog.c -@@ -12,7 +12,7 @@ - #include <windows.h> - #include <winsock2.h> - #include <ws2tcpip.h> --#else -+#elifndef __FreeBSD__ - #include <netdb.h> - #include <netinet/tcp.h> - |