X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fqemu;h=6d5f91926eb90c56f3255c59b6cf3161962cd349;hb=146a8b31a958274ffcedf4b96dd577049d51299c;hp=62010ee40d306e1e1d1968f606723dfc758b5a90;hpb=e2f8251726f7b4b567021a8631f153e014442f0c;p=ipfire-2.x.git

diff --git a/lfs/qemu b/lfs/qemu
index 62010ee40d..6d5f91926e 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.0
+VER        = 2.8.0
 
 THISAPP    = qemu-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -33,9 +33,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 20
+PAK_VER    = 22
 
-DEPS       = "sdl spice"
+DEPS       = "libusbredir sdl spice"
 
 ###############################################################################
 # Top-level Rules
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ca3f70b43f093e33e9e014f144067f13
+$(DL_FILE)_MD5 = 17940dce063b6ce450a12e719a6c9c43
 
 install : $(TARGET)
 
@@ -79,9 +79,9 @@ $(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-bluez --disable-attr \
+		--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
+		--extra-cflags="$(CFLAGS)" --enable-spice --enable-usb-redir
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
@@ -89,12 +89,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	install -m 755 $(DIR_SRC)/config/qemu/qemu /usr/bin/qemu
 
 	# disable PaX MPROTECT and RANDMMAP
-	paxctl -m -r /usr/bin/qemu-system-arm
-	paxctl -m -r /usr/bin/qemu-system-i386
-	paxctl -m -r /usr/bin/qemu-system-x86_64
-	paxctl -m -r /usr/bin/qemu-arm
-	paxctl -m -r /usr/bin/qemu-i386
-	paxctl -m -r /usr/bin/qemu-x86_64
+	paxctl -cmr /usr/bin/qemu-system-arm
+	paxctl -cmr /usr/bin/qemu-system-i386
+	paxctl -cmr /usr/bin/qemu-system-x86_64
+	paxctl -cmr /usr/bin/qemu-arm
+	paxctl -cmr /usr/bin/qemu-i386
+	paxctl -cmr /usr/bin/qemu-x86_64
+
 	# 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