X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fqemu;h=edd7a78a9fec4be212bc7ff764a1626c437f4667;hb=aa81aaf83646a9cbaf07f0e5358fee66ef6e4c06;hp=8512568b60db06e5101498127868679894f85f8d;hpb=31a849dd53128b3460f3d6f620a9ca286379e729;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/qemu b/lfs/qemu
index 8512568b60..edd7a78a9f 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-2020  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,18 +24,18 @@
 
 include Config
 
-VER        = 2.3.0
+VER        = 5.0.0
 
 THISAPP    = qemu-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586
+SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 15
+PAK_VER    = 28
 
-DEPS       = "sdl"
+DEPS       = libusbredir spice libseccomp
 
 ###############################################################################
 # Top-level Rules
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2fab3ea4460de9b57192e5b8b311f221
+$(DL_FILE)_MD5 = ede6005d7143fe994dd089d31dc2cf6c
 
 install : $(TARGET)
 
@@ -78,19 +78,31 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
-		--enable-kvm --disable-attr \
-		--target-list="i386-linux-user i386-softmmu arm-softmmu" \
-		--extra-cflags="$(CFLAGS)"
+
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-4.1.0-build-fix-glibc-2.31.patch
+
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-kvm \
+		--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 \
+		--enable-seccomp \
+		--disable-docs \
+		--disable-sdl
+
 	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
 
-	# disable PaX MPROTECT
-	paxctl -m /usr/bin/qemu-system-arm
-	paxctl -m /usr/bin/qemu-system-i386
+	# 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)