X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fqemu;h=015837a59422684f7a24d4cdae3a15876e77ec64;hp=20f594241a7df224fbdcfa864a57567f0a421c95;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=28162d3293a0b33237fda408a79cfe685dd6693a

diff --git a/lfs/qemu b/lfs/qemu
index 20f594241a..015837a594 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,18 @@
 
 include Config
 
-VER        = 0.15.0
+VER        = 2.11.0
 
-THISAPP    = qemu-kvm-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = qemu-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 13
+PAK_VER    = 23
 
-DEPS       = "sdl"
+DEPS       = "libusbredir sdl spice"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b45b0deebba4ce47dcaaab3807f6ed47
+$(DL_FILE)_MD5 = 335994a755bc655e88a87aeb36bfc0b9
 
 install : $(TARGET)
 
@@ -76,14 +77,20 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
-	cd $(DIR_APP) && sed -i -e 's|CFLAGS+="-march=i486"|CFLAGS+=""|g' configure
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.15.0_missing_definitions_hack.patch
-
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-2.11.0-memfd-collision.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
-		--target-list="i386-linux-user i386-softmmu arm-softmmu"
+		--localstatedir=/var --enable-kvm --disable-bluez --disable-attr \
+		--target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \
+		--extra-cflags="$(CFLAGS)" --enable-spice --enable-usb-redir
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
+	# install wrapper for old kvm parameter handling
+	install -m 755 $(DIR_SRC)/config/qemu/qemu /usr/bin/qemu
+
+	# install an udev script to set the permissions of /dev/kvm
+	cp -avf $(DIR_SRC)/config/qemu/65-kvm.rules /lib/udev/rules.d/65-kvm.rules
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)