Browse Source

update qemu to latest upstream version, remove oss header patch

Waldemar Brodkorb 10 years ago
parent
commit
3b48823deb
2 changed files with 2 additions and 29 deletions
  1. 2 2
      package/qemu/Makefile
  2. 0 27
      package/qemu/patches/patch-linux-user_syscall_c

+ 2 - 2
package/qemu/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		qemu
 PKG_NAME:=		qemu
-PKG_VERSION:=		2.3.0
+PKG_VERSION:=		2.4.0
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
-PKG_HASH:=		b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588
+PKG_HASH:=		72b0b991bbcc540663a019e1e8c4f714053b691dda32c9b9ee80b25f367e6620
 PKG_DESCR:=		cpu and system emulator
 PKG_DESCR:=		cpu and system emulator
 PKG_SECTION:=		sys/misc
 PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		zlib glib alsa-lib
 PKG_DEPENDS:=		zlib glib alsa-lib

+ 0 - 27
package/qemu/patches/patch-linux-user_syscall_c

@@ -1,27 +0,0 @@
---- qemu-2.2.0.orig/linux-user/syscall.c	2014-12-09 08:45:43.000000000 -0600
-+++ qemu-2.2.0/linux-user/syscall.c	2015-01-15 20:18:47.215154181 -0600
-@@ -44,6 +44,7 @@
- #include <sys/mman.h>
- #include <sys/swap.h>
- #include <linux/capability.h>
-+#include <linux/version.h>
- #include <signal.h>
- #include <sched.h>
- #ifdef __ia64__
-@@ -96,6 +97,16 @@ int __clone2(int (*fn)(void *), void *ch
- #include <linux/unistd.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/soundcard.h>
- #include <linux/kd.h>
- #include <linux/mtio.h>