aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-04-02 16:25:35 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-04-02 16:25:35 +0000
commitb22358edbf76a1c893ee868005aedc17fb51e218 (patch)
tree7895f3dc8d3b11f60f5322f4794a4e9b3f0d516c
parent072d75237673bad4e9d6bc93aa5a5419c00ebe1e (diff)
downloadmaster-187ad058-b22358edbf76a1c893ee868005aedc17fb51e218.tar.gz
master-187ad058-b22358edbf76a1c893ee868005aedc17fb51e218.tar.bz2
master-187ad058-b22358edbf76a1c893ee868005aedc17fb51e218.zip
[tools] qemu: update to 0.14.1
This patch has not been tested on freebsd. File block/sheepdog.c has been changed and the patch does no longer apply. Anyone with freebsd who could test this? All my other patches regarding the tools upgrade were tested on linux x64 and produce a working image. Once submitted patches get applied I will upgrade the remaining tools... Signed-off-by: Luka Perkov <openwrt@lukaperkov.net> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31175 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--tools/qemu/Makefile6
-rw-r--r--tools/qemu/patches/010-freebsd-fix.patch11
2 files changed, 3 insertions, 14 deletions
diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile
index c0d587b243..111cc6d3c4 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,12 +7,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=qemu
-PKG_VERSION:=0.13.0
+PKG_VERSION:=0.14.1
PKG_RELEASE:=1
PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/qemu/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=397a0d665da8ba9d3b9583629f3d6421
+PKG_MD5SUM:=b6c713a8db638e173af53a62d5178640
include $(INCLUDE_DIR)/host-build.mk
diff --git a/tools/qemu/patches/010-freebsd-fix.patch b/tools/qemu/patches/010-freebsd-fix.patch
deleted file mode 100644
index 1fc0912096..0000000000
--- 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>
-