From: maniacikarus <maniacikarus@ipfire.org>
Date: Fri, 6 Mar 2009 08:12:15 +0000 (+0100)
Subject: Upgraded qemu to current stable
X-Git-Tag: v2.5-beta1~133
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=399ed04b2b032bc59f14c9a3c49483852ba2320d;p=ipfire-2.x.git

Upgraded qemu to current stable
---

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index b729d5648d..c918aec345 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -1,9 +1,11 @@
 usr/bin/qemu
 usr/bin/qemu-i386
 usr/bin/qemu-img
+usr/bin/qemu-nbd
 usr/bin/qemu-ppc
 usr/bin/qemu-system-ppc
 usr/share/qemu
+usr/share/qemu/bamboo.dtb
 usr/share/qemu/bios.bin
 usr/share/qemu/keymaps
 usr/share/qemu/keymaps/ar
@@ -41,8 +43,11 @@ usr/share/qemu/keymaps/sl
 usr/share/qemu/keymaps/sv
 usr/share/qemu/keymaps/th
 usr/share/qemu/keymaps/tr
+usr/share/qemu/openbios-ppc
 usr/share/qemu/openbios-sparc32
+usr/share/qemu/openbios-sparc64
 usr/share/qemu/ppc_rom.bin
+usr/share/qemu/pxe-e1000.bin
 usr/share/qemu/pxe-ne2k_pci.bin
 usr/share/qemu/pxe-pcnet.bin
 usr/share/qemu/pxe-rtl8139.bin
diff --git a/lfs/qemu b/lfs/qemu
index 5e7d980d2b..659cd160ee 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.1
+VER        = 0.10.0
 
 THISAPP    = qemu-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = qemu
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = "sdl"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6591df8e9270eb358c881de4ebea1262
+$(DL_FILE)_MD5 = 8dc50b834fa3f5f6a17d7bc3d0559e53
 
 install : $(TARGET)
 
@@ -79,14 +79,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	
 	# Apply a number of patches mainly for gcc 4
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-enforce-16byte-stack-boundary.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4-hacks.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4-opts.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-enforce-16byte-stack-boundary.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4-hacks.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4-opts.patch
 	
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-gcc-check \
-		--disable-gfx-check --target-list="i386-linux-user i386-softmmu ppc-softmmu ppc-linux-user" \
-		--enable-alsa
+	cd $(DIR_APP) && ./configure --prefix=/usr \
+		--disable-gfx-check --target-list="i386-linux-user i386-softmmu ppc-softmmu ppc-linux-user"
 		
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install