From a5c5377197fe8dcd47d7ebddae20665a5215b515 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 9 Nov 2009 22:09:54 +0100
Subject: [PATCH] Change qemu to a version that support kvm and kqemu.

---
 config/rootfiles/packages/qemu | 3 ---
 doc/packages-list.txt          | 4 ++--
 lfs/qemu                       | 8 +++-----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index a235b95438..21da316c75 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -3,12 +3,9 @@ usr/bin/qemu-i386
 usr/bin/qemu-img
 usr/bin/qemu-io
 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/extboot.bin
 usr/share/qemu/keymaps
 usr/share/qemu/keymaps/ar
 usr/share/qemu/keymaps/common
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index eb33f6c943..d852231960 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -66,7 +66,6 @@
 * ccache-2.4
 * cdrtools-2.01.01
 * centerim-4.22.1
-* clamav-0.95.2
 * clamav-0.95.3
 * cmake-2.4.8
 * collectd-4.5.3
@@ -161,6 +160,7 @@
 * kqemu-1.4.0pre1-kmod-2.6.27.31-ipfire
 * kqemu-1.4.0pre1-kmod-2.6.27.31-ipfire-xen
 * kudzu-1.2.64
+* kvm-kmod-2.6.31.5-kmod-2.6.27.31-ipfire
 * l7-protocols-2009-05-10
 * lame-3.97
 * lcd4linux-0.10.1-RC2
@@ -274,7 +274,7 @@
 * pptp-1.7.2
 * procps-3.2.6
 * psmisc-22.2
-* qemu-0.10.5
+* qemu-0.11.0
 * r8101-kmod-2.6.27.31-ipfire
 * r8101-kmod-2.6.27.31-ipfire-xen
 * r8168-8.014.00-kmod-2.6.27.31-ipfire
diff --git a/lfs/qemu b/lfs/qemu
index 2b87ce14ff..0fa5b93a7a 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -26,7 +26,7 @@ include Config
 
 VER        = 0.11.0
 
-THISAPP    = qemu-kvm-$(VER)
+THISAPP    = qemu-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 440837a062967102a68e634d57eaf719
+$(DL_FILE)_MD5 = 4da6a3e926a0260902f0dee342a59c23
 
 install : $(TARGET)
 
@@ -77,10 +77,8 @@ $(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 ppc-softmmu ppc-linux-user"
-		
+		--target-list="i386-linux-user i386-softmmu"
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
-- 
2.39.2