Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / lfs / qemu-kqemu

diff --git a/lfs/qemu-kqemu b/lfs/qemu-kqemu
index 99b3fe173cf6363b31d811abc8a1dc1e0a94982d..38dc6a7da192628d89cc45a59bec071f66b8af33 100644 (file)
--- a/lfs/qemu-kqemu
+++ b/lfs/qemu-kqemu
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.11.0
+VER        = 0.11.1
 
 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)-kqemu
 PROG       = qemu-kqemu
-PAK_VER    = 1
+PAK_VER    = 3
 
 DEPS       = "sdl qemu"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4da6a3e926a0260902f0dee342a59c23
+$(DL_FILE)_MD5 = 193285b0bcf655a7f7577d05ffcb82b1
 
 install : $(TARGET)
 
@@ -77,9 +77,11 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-kqemu_change-default-kqemu-bios.patch
        cd $(DIR_APP) && ./configure --prefix=/usr \
                --target-list="i386-softmmu"
        cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && cp i386-softmmu/qemu /usr/bin/qemu-kqemu
+       cd $(DIR_APP) && cp -f i386-softmmu/qemu /usr/bin/qemu-kqemu
+       cd $(DIR_APP) && cp -f pc-bios/bios.bin /usr/share/qemu/bios-kqemu.bin
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)