From 2cb46e81045e8463ec8c52f003aea169b7b6a739 Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 1 Mar 2008 19:03:58 +0000 Subject: [PATCH] Added kqemu to give the qemu more speed. This will be delivered with core 9. git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1244 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/apache2 | 2 +- config/rootfiles/common/kqemu | 2 + config/rootfiles/core/9/files | 2 + doc/packages-list.txt | 1 + lfs/Config | 7 ++- lfs/kqemu | 93 +++++++++++++++++++++++++++++++++ make.sh | 6 ++- 7 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 config/rootfiles/common/kqemu create mode 100644 lfs/kqemu diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 5fe2931052..e45c856f5c 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1658,6 +1658,6 @@ srv/web/ipfire/html #srv/web/ipfire/html/themes/ipfire/include/colours.txt #srv/web/ipfire/html/themes/ipfire/include/functions.pl #srv/web/ipfire/html/themes/ipfire/include/style.css -/var/updatecache #srv/web/ipfire/html/updatecache/download #srv/web/ipfire/html/updatecache/metadata +var/updatecache diff --git a/config/rootfiles/common/kqemu b/config/rootfiles/common/kqemu new file mode 100644 index 0000000000..a1210f6fee --- /dev/null +++ b/config/rootfiles/common/kqemu @@ -0,0 +1,2 @@ +lib/modules/KVER-ipfire/misc/kqemu.ko +lib/modules/KVER-ipfire-smp/misc/kqemu.ko diff --git a/config/rootfiles/core/9/files b/config/rootfiles/core/9/files index bc947fe832..d4df9b3e9a 100644 --- a/config/rootfiles/core/9/files +++ b/config/rootfiles/core/9/files @@ -1,3 +1,5 @@ +lib/modules/2.6.16.57-ipfire/misc/kqemu.ko +lib/modules/2.6.16.57-ipfire-smp/misc/kqemu.ko sbin/hdparm usr/lib/collectd usr/sbin/collectd diff --git a/doc/packages-list.txt b/doc/packages-list.txt index e6677f2b63..7349ca0ddb 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -125,6 +125,7 @@ * jpegsrc.v6b * kbd-1.12 * klibc-1.5 +* kqemu-1.3.0pre11 * kudzu-1.2.64 * l7-protocols-2007-10-10 * lame-3.97 diff --git a/lfs/Config b/lfs/Config index 109eec3693..39fd5eafcf 100644 --- a/lfs/Config +++ b/lfs/Config @@ -185,11 +185,14 @@ define PAK cp -f /usr/src/src/paks/default/{,un}install.sh /usr/src/src/paks/default/update.sh \ /install/packages/package; \ fi - sed -e "s/KVER/$(KVER)/g" < /usr/src/config/rootfiles/packages/$(PROG) > /install/packages/package/ROOTFILES + cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES + sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES chmod 755 /install/packages/package/{{,un}install,update}.sh cd / && tar cf /install/packages/package/files --files-from=/install/packages/package/ROOTFILES --exclude='#*' \ --preserve --numeric-owner - -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES + if grep -q '#' < /install/packages/package/ROOTFILES; then \ + cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES; \ + fi cd /install/packages/package && tar cf ../$(PROG)-$(VER)-$(PAK_VER).ipfire --files-from=/usr/src/src/paks/files rm -rf /install/packages/package sed -e s/NAME/$(PROG)/g \ diff --git a/lfs/kqemu b/lfs/kqemu new file mode 100644 index 0000000000..7f07dd28b2 --- /dev/null +++ b/lfs/kqemu @@ -0,0 +1,93 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 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 . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.3.0pre11 + +THISAPP = kqemu-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +ifeq "$(SMP)" "1" + TARGET = $(DIR_INFO)/$(THISAPP)-smp +else + TARGET = $(DIR_INFO)/$(THISAPP) +endif + + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 970521874ef8b1ba4598925ace5936c3 + +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) + +ifeq "$(SMP)" "1" + cd $(DIR_APP) && ./configure --prefix=/usr --kernel-path=/lib/modules/$(KVER)-ipfire-smp/build/ + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && install -m 644 kqemu.ko /lib/modules/$(KVER)-ipfire-smp/misc/ +else + cd $(DIR_APP) && ./configure --prefix=/usr --kernel-path=/lib/modules/$(KVER)-ipfire/build/ + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && install -m 644 kqemu.ko /lib/modules/$(KVER)-ipfire/misc/ +endif + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index f022e2b4f6..fc1dd42da8 100755 --- a/make.sh +++ b/make.sh @@ -326,8 +326,9 @@ buildipfire() { ipfiremake zaptel SMP=1 ipfiremake r8169 SMP=1 ipfiremake r8168 SMP=1 - ipfiremake mcs7830 SMP=1 - ipfiremake atl1 SMP=1 + ipfiremake mcs7830 SMP=1 + ipfiremake atl1 SMP=1 + ipfiremake kqemu SMP=1 ipfiremake linux ipfiremake ipp2p ipfiremake zaptel @@ -335,6 +336,7 @@ buildipfire() { ipfiremake r8168 ipfiremake mcs7830 ipfiremake atl1 + ipfiremake kqemu ipfiremake pkg-config ipfiremake linux-atm ipfiremake cpio -- 2.39.2