X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fqemu;h=d68b97d1e5667a66320706b962c576f742886222;hp=7925f0d3b8301102150070700911280a438fd8c2;hb=68a3ec7d6a25ba4bde14e886889c28bd4a3841ff;hpb=5c3a57a50de2f6ebd17aada9df5d2baa111827a1

diff --git a/lfs/qemu b/lfs/qemu
index 7925f0d3b8..d68b97d1e5 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -24,15 +24,16 @@
 
 include Config
 
-VER        = 0.12.3
+VER        = 0.15.0
 
-THISAPP    = qemu-$(VER)
+THISAPP    = qemu-kvm-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 PROG       = qemu
-PAK_VER    = 10
+PAK_VER    = 13
 
 DEPS       = "sdl"
 
@@ -44,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d215e4568650e8019816397174c090e1
+$(DL_FILE)_MD5 = b45b0deebba4ce47dcaaab3807f6ed47
 
 install : $(TARGET)
 
@@ -77,8 +78,10 @@ $(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) && ./configure --prefix=/usr \
-		--target-list="i386-linux-user i386-softmmu"
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.15.0_missing_definitions_hack.patch
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
+		--target-list="i386-linux-user i386-softmmu arm-softmmu" \
+		--extra-cflags="$(CFLAGS)"
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)