kqemu: removed.

diff --git a/config/rootfiles/common/i586/kqemu b/config/rootfiles/common/i586/kqemu
deleted file mode 100644 (file)
index 88244ee..0000000
--- a/config/rootfiles/common/i586/kqemu
+++ /dev/null
@@ -1,2 +0,0 @@
-#lib/modules/KVER-ipfire/misc
-lib/modules/KVER-ipfire/misc/kqemu.ko

diff --git a/config/rootfiles/packages/qemu-kqemu b/config/rootfiles/packages/qemu-kqemu
deleted file mode 100644 (file)
index 7a908f7..0000000
--- a/config/rootfiles/packages/qemu-kqemu
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/qemu-kqemu
-usr/share/qemu/bios-kqemu.bin

diff --git a/lfs/kqemu b/lfs/kqemu
deleted file mode 100644 (file)
index 6e5ecfa..0000000
--- a/lfs/kqemu
+++ /dev/null
@@ -1,84 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  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        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VERSUFIX=ipfire$(KCFG)
-
-VER        = 1.4.0pre1
-
-THISAPP    = kqemu-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
-SUP_ARCH   = i586
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = d738d8ca7332211ab716ec3213d82ee1
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-       $(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(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 --kernel-path=/usr/src/linux
-       cd $(DIR_APP) && make $(MAKETUNING)
-       -mkdir -p /lib/modules/$(KVER)-$(VERSUFIX)/misc/
-       cd $(DIR_APP) && install -m 644 kqemu.ko /lib/modules/$(KVER)-$(VERSUFIX)/misc/
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/lfs/qemu-kqemu b/lfs/qemu-kqemu
deleted file mode 100644 (file)
index c2b6b33..0000000
--- a/lfs/qemu-kqemu
+++ /dev/null
@@ -1,88 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# 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        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 0.11.1
-
-THISAPP    = qemu-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)-kqemu
-SUP_ARCH   = i586
-PROG       = qemu-kqemu
-PAK_VER    = 3
-
-DEPS       = "sdl qemu"
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 193285b0bcf655a7f7577d05ffcb82b1
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-       @$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(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 -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/make.sh b/make.sh
index 755db8d9b9b5436f5d80409907c74e0388daf95a..e6e518db759ffc663243a0b527fbed3e885846e4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -383,7 +383,6 @@ buildipfire() {
   # The xen and PAE kernels are only available for x86
   if [ "${MACHINE_TYPE}" != "arm" ]; then
     ipfiremake linux2                  KCFG="-xen"
-    ipfiremake kqemu                   KCFG="-xen"
     ipfiremake v4l-dvb                 KCFG="-xen"
     ipfiremake mISDN                   KCFG="-xen"
     ipfiremake dahdi                   KCFG="-xen" KMOD=1
@@ -397,7 +396,6 @@ buildipfire() {
     ipfiremake igb                     KCFG="-xen"
 
     ipfiremake linux                   KCFG="-pae"
-    ipfiremake kqemu                   KCFG="-pae"
     ipfiremake kvm-kmod                        KCFG="-pae"
     ipfiremake v4l-dvb                 KCFG="-pae"
     ipfiremake alsa                    KCFG="-pae" KMOD=1
@@ -414,7 +412,6 @@ buildipfire() {
 
     ipfiremake linux                   KCFG=""
     ipfiremake v4l-dvb                 KCFG=""
-    ipfiremake kqemu                   KCFG=""
     ipfiremake kvm-kmod                        KCFG=""
     ipfiremake alsa                    KCFG="" KMOD=1
     ipfiremake mISDN                   KCFG=""
@@ -436,7 +433,6 @@ buildipfire() {
     # arm-versatile kernel build
     ipfiremake linux                   KCFG="-versatile"
     ipfiremake v4l-dvb                 KCFG="-versatile"
-    ipfiremake kqemu                   KCFG="-versatile"
     ipfiremake kvm-kmod                        KCFG="-versatile"
     ipfiremake mISDN                   KCFG="-versatile"
     ipfiremake dahdi                   KCFG="-versatile" KMOD=1
@@ -451,7 +447,6 @@ buildipfire() {
     # arm-kirkwood kernel build
     ipfiremake linux                   KCFG="-kirkwood"
     ipfiremake v4l-dvb                 KCFG="-kirkwood"
-    ipfiremake kqemu                   KCFG="-kirkwood"
     ipfiremake kvm-kmod                        KCFG="-kirkwood"
     ipfiremake mISDN                   KCFG="-kirkwood"
     ipfiremake dahdi                   KCFG="-kirkwood" KMOD=1
@@ -666,7 +661,6 @@ buildipfire() {
   ipfiremake fbset
   ipfiremake sdl
   ipfiremake qemu
-  ipfiremake qemu-kqemu
   ipfiremake sane
   ipfiremake netpbm
   ipfiremake phpSANE

diff --git a/src/patches/qemu-kqemu_change-default-kqemu-bios.patch b/src/patches/qemu-kqemu_change-default-kqemu-bios.patch
deleted file mode 100644 (file)
index a36c54e..0000000
--- a/src/patches/qemu-kqemu_change-default-kqemu-bios.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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"
-