Readd old qemu version with kqemu support.

diff --git a/config/rootfiles/packages/qemu-kqemu b/config/rootfiles/packages/qemu-kqemu
new file mode 100644 (file)
index 0000000..f70d328
--- /dev/null
+++ b/config/rootfiles/packages/qemu-kqemu
@@ -0,0 +1 @@
+usr/bin/qemu-kqemu

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 959af047a054ab489bd1fcce4e2d70736792b6f8..806033c183485a113ba850e1382e5df5372779ab 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -36,17 +36,17 @@
 * Unix-Syslog-0.100
 * XML-Parser-2.34
 * alsa-lib-1.0.22
-* alsa-lib-1.0.22-kmod-2.6.27.45-ipfire
+* alsa-lib-1.0.22-kmod-2.6.27.42-ipfire
 * amavisd-new-2.5.2
 * apcupsd-3.14.4
 * applejuice-0.31
 * arping-2.05
 * as86-0.16.17
 * asterisk-1.4.28
-* atl1c-kmod-2.6.27.45-ipfire
-* atl1c-kmod-2.6.27.45-ipfire-xen
-* atl2-2.0.5-kmod-2.6.27.45-ipfire
-* atl2-2.0.5-kmod-2.6.27.45-ipfire-xen
+* atl1c-kmod-2.6.27.42-ipfire
+* atl1c-kmod-2.6.27.42-ipfire-xen
+* atl2-2.0.5-kmod-2.6.27.42-ipfire
+* atl2-2.0.5-kmod-2.6.27.42-ipfire-xen
 * autoconf-2.59
 * automake-1.9.6
 * backup-ipfire
@@ -71,8 +71,8 @@
 * clamav-0.95.3
 * cmake-2.4.8
 * collectd-4.5.3
-* compat-wireless-2.6.32.3-kmod-2.6.27.45-ipfire
-* compat-wireless-2.6.32.3-kmod-2.6.27.45-ipfire-xen
+* compat-wireless-2.6.32.2-kmod-2.6.27.42-ipfire
+* compat-wireless-2.6.32.2-kmod-2.6.27.42-ipfire-xen
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-007
@@ -81,8 +81,8 @@
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
 * dahdi-2.2.0.2
-* dahdi-2.2.0.2-kmod-2.6.27.45-ipfire
-* dahdi-2.2.0.2-kmod-2.6.27.45-ipfire-xen
+* dahdi-2.2.0.2-kmod-2.6.27.42-ipfire
+* dahdi-2.2.0.2-kmod-2.6.27.42-ipfire-xen
 * db-4.4.20
 * dbus-1.0.3
 * dhcp-3.1.0
@@ -90,20 +90,22 @@
 * diffutils-2.8.1
 * dnsmasq-2.45
 * dosfstools-2.11
-* e1000e-1.0.2.5-kmod-2.6.27.45-ipfire
-* e1000e-1.0.2.5-kmod-2.6.27.45-ipfire-xen
+* e1000e-1.0.2.5-kmod-2.6.27.42-ipfire
+* e1000e-1.0.2.5-kmod-2.6.27.42-ipfire-xen
 * e2fsprogs-1.39
 * ebtables-v2.0.8-2
 * ed-0.2
+* eject-2.1.5
 * elinks-0.11.6
 * esniper-2-19-0
 * espgs-8.15.1
-* et131x-kmod-2.6.27.45-ipfire
-* et131x-kmod-2.6.27.45-ipfire-xen
+* et131x-kmod-2.6.27.42-ipfire
+* et131x-kmod-2.6.27.42-ipfire-xen
 * etherwake-1.09
 * ethtool-3
 * expat-2.0.0
 * ez-ipupdate-3.0.11b8
+* faad2-2.7
 * fbset-2.1
 * fcron-3.0.4
 * feedparser-4.1
@@ -139,8 +141,8 @@
 * hdparm-8.9
 * hostapd-0.6.9
 * hplip-2.7.10
-* hso-1.9-kmod-2.6.27.45-ipfire
-* hso-1.9-kmod-2.6.27.45-ipfire-xen
+* hso-1.9-kmod-2.6.27.42-ipfire
+* hso-1.9-kmod-2.6.27.42-ipfire-xen
 * htop-0.8.1
 * httpd-2.2.11
 * hwdata
@@ -164,10 +166,10 @@
 * jpegsrc.v6b
 * kbd-1.12
 * klibc-1.5.14
-* kqemu-1.4.0pre1-kmod-2.6.27.45-ipfire
-* kqemu-1.4.0pre1-kmod-2.6.27.45-ipfire-xen
+* kqemu-1.4.0pre1-kmod-2.6.27.42-ipfire
+* kqemu-1.4.0pre1-kmod-2.6.27.42-ipfire-xen
 * kudzu-1.2.64
-* kvm-kmod-2.6.31.5-kmod-2.6.27.45-ipfire
+* kvm-kmod-2.6.31.5-kmod-2.6.27.42-ipfire
 * l7-protocols-2009-05-10
 * lame-3.97
 * lcd4linux-0.10.1-RC2
@@ -198,8 +200,8 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.27.45-ipfire
-* linux-2.6.27.45-ipfire-xen
+* linux-2.6.27.42-ipfire
+* linux-2.6.27.42-ipfire-xen
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
 * lm_sensors-3.1.2
@@ -209,11 +211,11 @@
 * lynis-1.2.6
 * lzo-2.02
 * m4-1.4.4
-* mISDN_20090906-kmod-2.6.27.45-ipfire
-* mISDN_20090906-kmod-2.6.27.45-ipfire-xen
+* mISDN_20090906-kmod-2.6.27.42-ipfire
+* mISDN_20090906-kmod-2.6.27.42-ipfire-xen
 * mISDNuser_20090906
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.27.45-ipfire
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.27.45-ipfire-xen
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.27.42-ipfire
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.27.42-ipfire-xen
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34
@@ -262,8 +264,8 @@
 * openssh-5.3p1
 * openssl-0.9.8l
 * openswan-2.6.23
-* openswan-2.6.23-kmod-2.6.27.45-ipfire
-* openswan-2.6.23-kmod-2.6.27.45-ipfire-xen
+* openswan-2.6.23-kmod-2.6.27.42-ipfire
+* openswan-2.6.23-kmod-2.6.27.42-ipfire-xen
 * openvpn-2.1_rc20
 * p7zip_4.65
 * pam_mysql-0.7RC1
@@ -283,13 +285,14 @@
 * pptp-1.7.2
 * procps-3.2.6
 * psmisc-22.2
+* qemu-0.11.0-kqemu
 * qemu-0.12.2
-* r8101-kmod-2.6.27.45-ipfire
-* r8101-kmod-2.6.27.45-ipfire-xen
-* r8168-8.014.00-kmod-2.6.27.45-ipfire
-* r8168-8.014.00-kmod-2.6.27.45-ipfire-xen
-* r8169-6.011.00-kmod-2.6.27.45-ipfire
-* r8169-6.011.00-kmod-2.6.27.45-ipfire-xen
+* r8101-kmod-2.6.27.42-ipfire
+* r8101-kmod-2.6.27.42-ipfire-xen
+* r8168-8.014.00-kmod-2.6.27.42-ipfire
+* r8168-8.014.00-kmod-2.6.27.42-ipfire-xen
+* r8169-6.011.00-kmod-2.6.27.42-ipfire
+* r8169-6.011.00-kmod-2.6.27.42-ipfire-xen
 * readline-5.1
 * reiser4progs-1.0.5
 * reiserfsprogs-3.6.19
@@ -316,7 +319,7 @@
 * squashfs3.4
 * squid-2.7.STABLE7
 * squidGuard-1.4.1
-* squidclamav-4.1
+* squidclamav-5.0
 * sshfs-fuse-2.2
 * sslh-1.6i
 * streamripper-1.63.5
@@ -345,8 +348,8 @@
 * usb_modeswitch-1.0.6
 * usbutils-0.72
 * util-linux-2.12r
-* v4l-dvb-690055993011-kmod-2.6.27.45-ipfire
-* v4l-dvb-690055993011-kmod-2.6.27.45-ipfire-xen
+* v4l-dvb-9defbd461e5f-kmod-2.6.27.42-ipfire
+* v4l-dvb-9defbd461e5f-kmod-2.6.27.42-ipfire-xen
 * vdr-1.6.0
 * vdradmin-am-3.6.5
 * vim-7.0

diff --git a/lfs/qemu-kqemu b/lfs/qemu-kqemu
new file mode 100644 (file)
index 0000000..99b3fe1
--- /dev/null
+++ b/lfs/qemu-kqemu
@@ -0,0 +1,85 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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.0
+
+THISAPP    = qemu-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)-kqemu
+PROG       = qemu-kqemu
+PAK_VER    = 1
+
+DEPS       = "sdl qemu"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 4da6a3e926a0260902f0dee342a59c23
+
+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 \
+               --target-list="i386-softmmu"
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && cp i386-softmmu/qemu /usr/bin/qemu-kqemu
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 51c1cd66cb4f22acb3846f3d01fbda1227fde027..523465fc05f1b195acaae1ea7889053ab7c5610b 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -574,6 +574,7 @@ buildipfire() {
   ipfiremake fbset
   ipfiremake sdl
   ipfiremake qemu
+  ipfiremake qemu-kqemu
   ipfiremake sane
   ipfiremake netpbm
   ipfiremake phpSANE