X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fqemu;h=8512568b60db06e5101498127868679894f85f8d;hp=20f594241a7df224fbdcfa864a57567f0a421c95;hb=7383bf2b1bdd343dcbe1f9f49f76cbc157316ee1;hpb=9c7da0c6d9adc6020a4815a90f0bb5930d57a97b

diff --git a/lfs/qemu b/lfs/qemu
index 20f594241a..8512568b60 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -24,15 +24,16 @@
 
 include Config
 
-VER        = 0.15.0
+VER        = 2.3.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
 PROG       = qemu
-PAK_VER    = 13
+PAK_VER    = 15
 
 DEPS       = "sdl"
 
@@ -44,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b45b0deebba4ce47dcaaab3807f6ed47
+$(DL_FILE)_MD5 = 2fab3ea4460de9b57192e5b8b311f221
 
 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) && ./configure --prefix=/usr --sysconfdir=/etc \
-		--target-list="i386-linux-user i386-softmmu arm-softmmu"
+		--enable-kvm --disable-attr \
+		--target-list="i386-linux-user i386-softmmu arm-softmmu" \
+		--extra-cflags="$(CFLAGS)"
 	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
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)