qemu-kqemu: fix bios default.

diff --git a/config/rootfiles/packages/qemu-kqemu b/config/rootfiles/packages/qemu-kqemu
index f70d3289f8164adc60a8a3cd3f37839df2aeb6ea..7a908f7611c0d95cbda1de77b9dcbd4b368d9606 100644 (file)
--- a/config/rootfiles/packages/qemu-kqemu
+++ b/config/rootfiles/packages/qemu-kqemu
@@ -1 +1,2 @@
 usr/bin/qemu-kqemu
+usr/share/qemu/bios-kqemu.bin

diff --git a/lfs/qemu-kqemu b/lfs/qemu-kqemu
index a3c99b4512eb034ab3d24cd4356b69ffd81eafb1..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        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kqemu
 PROG       = qemu-kqemu
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "sdl qemu"
 
@@ -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)

diff --git a/src/patches/qemu-kqemu_change-default-kqemu-bios.patch b/src/patches/qemu-kqemu_change-default-kqemu-bios.patch
new file mode 100644 (file)
index 0000000..a36c54e
--- /dev/null
+++ b/src/patches/qemu-kqemu_change-default-kqemu-bios.patch
@@ -0,0 +1,12 @@
+diff -Naur qemu-0.11.1.org/hw/pc.c qemu-0.11.1/hw/pc.c
+--- qemu-0.11.1.org/hw/pc.c    2009-12-02 21:27:02.000000000 +0100
++++ qemu-0.11.1/hw/pc.c        2010-12-27 12:09:41.845206649 +0100
+@@ -43,7 +43,7 @@
+ /* Show multiboot debug output */
+ //#define DEBUG_MULTIBOOT
+ 
+-#define BIOS_FILENAME "bios.bin"
++#define BIOS_FILENAME "bios-kqemu.bin"
+ #define VGABIOS_FILENAME "vgabios.bin"
+ #define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin"
+