diff options
| -rw-r--r-- | package/qemu/Makefile | 4 | ||||
| -rw-r--r-- | package/qemu/patches/patch-linux-user_syscall_c | 35 | ||||
| -rw-r--r-- | package/qemu/patches/patch-util_qemu-openpty_c | 11 |
3 files changed, 2 insertions, 48 deletions
diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 4ec4365d3..e1e04c72b 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= qemu -PKG_VERSION:= 2.0.0 +PKG_VERSION:= 2.1.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 2790f44fd76da5de5024b4aafeb594c2 +PKG_MD5SUM:= 6726977292b448cbc7f89998fac6983b PKG_DESCR:= cpu and system emulator PKG_SECTION:= sys/misc PKG_DEPENDS:= zlib glib diff --git a/package/qemu/patches/patch-linux-user_syscall_c b/package/qemu/patches/patch-linux-user_syscall_c deleted file mode 100644 index 11188ca90..000000000 --- a/package/qemu/patches/patch-linux-user_syscall_c +++ /dev/null @@ -1,35 +0,0 @@ ---- qemu-1.7.1.orig/linux-user/syscall.c 2014-03-25 15:01:10.000000000 +0100 -+++ qemu-1.7.1/linux-user/syscall.c 2014-04-04 16:51:08.292546548 +0200 -@@ -63,6 +63,7 @@ int __clone2(int (*fn)(void *), void *ch - //#include <sys/user.h> - #include <netinet/ip.h> - #include <netinet/tcp.h> -+#include <linux/version.h> - #include <linux/wireless.h> - #include <linux/icmp.h> - #include "qemu-common.h" -@@ -94,7 +95,15 @@ int __clone2(int (*fn)(void *), void *ch - #include <linux/utsname.h> - #include <linux/cdrom.h> - #include <linux/hdreg.h> -+#ifdef NATIVE -+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0) - #include <linux/soundcard.h> -+#else -+#include <linux/soundcard.h.oss3> -+#endif -+#else -+#include <linux/soundcard.h> -+#endif - #include <linux/kd.h> - #include <linux/mtio.h> - #include <linux/fs.h> -@@ -400,7 +409,7 @@ static int sys_inotify_init1(int flags) - #endif - #define __NR_sys_ppoll __NR_ppoll - _syscall5(int, sys_ppoll, struct pollfd *, fds, nfds_t, nfds, -- struct timespec *, timeout, const __sigset_t *, sigmask, -+ struct timespec *, timeout, const sigset_t *, sigmask, - size_t, sigsetsize) - #endif - diff --git a/package/qemu/patches/patch-util_qemu-openpty_c b/package/qemu/patches/patch-util_qemu-openpty_c deleted file mode 100644 index ed524628a..000000000 --- a/package/qemu/patches/patch-util_qemu-openpty_c +++ /dev/null @@ -1,11 +0,0 @@ ---- qemu-1.7.0.orig/util/qemu-openpty.c 2013-11-27 23:15:55.000000000 +0100 -+++ qemu-1.7.0/util/qemu-openpty.c 2014-03-14 09:05:17.280258135 +0100 -@@ -35,7 +35,7 @@ - #include "config-host.h" - #include "qemu-common.h" - --#if defined(__GLIBC__) -+#if defined(__linux__) - # include <pty.h> - #elif defined CONFIG_BSD - # include <termios.h> |