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

diff --git a/config/rootfiles/core/30/filelists/files b/config/rootfiles/core/30/filelists/files
index 4af6d78dd4e7f0dd80cb03700c84574ab2ccb119..bd50d86d37dcd116188fc6d3b3ba894e2298012e 100644 (file)
--- a/config/rootfiles/core/30/filelists/files
+++ b/config/rootfiles/core/30/filelists/files
@@ -1,3 +1,5 @@
+lib/modules/2.6.27.25-ipfire/kernel/drivers/net/e1000e/e1000e.ko
+lib/modules/2.6.27.25-ipfire/kernel/drivers/net/usb/hso.ko
 lib/modules/2.6.27.25-ipfire/kernel/drivers/usb/serial/option.ko
 var/ipfire/langs/list
 var/ipfire/langs/de.pl

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index ef8f1cdb1df57795ef963b087f63937cece0b7c7..6ad47d062a1559099c0bcaf71822061cf5e5c692 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -69,8 +69,8 @@
 * clamav-0.95.2
 * cmake-2.4.8
 * collectd-4.5.3
-* compat-wireless-2009-07-15-kmod-2.6.27.25-ipfire
-* compat-wireless-2009-07-15-kmod-2.6.27.25-ipfire-xen
+* compat-wireless-2009-06-30-kmod-2.6.27.25-ipfire
+* compat-wireless-2009-06-30-kmod-2.6.27.25-ipfire-xen
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-005
@@ -85,6 +85,8 @@
 * diffutils-2.8.1
 * dnsmasq-2.47
 * dosfstools-2.11
+* e1000e-1.0.2.5-kmod-2.6.27.25-ipfire
+* e1000e-1.0.2.5-kmod-2.6.27.25-ipfire-xen
 * e2fsprogs-1.39
 * ebtables-v2.0.8-2
 * ed-0.2
@@ -130,6 +132,8 @@
 * hdparm-8.9
 * hostapd-0.6.9
 * hplip-2.7.10
+* hso-1.9-kmod-2.6.27.25-ipfire
+* hso-1.9-kmod-2.6.27.25-ipfire-xen
 * htop-0.8.1
 * httpd-2.2.11
 * hwdata

diff --git a/lfs/e1000e b/lfs/e1000e
new file mode 100644 (file)
index 0000000..79e5097
--- /dev/null
+++ b/lfs/e1000e
@@ -0,0 +1,87 @@
+###############################################################################
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+ifeq "$(XEN)" "1"
+       VERSUFIX = ipfire-xen
+else
+       VERSUFIX = ipfire
+endif
+
+VER        = 1.0.2.5
+
+THISAPP    = e1000e-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 734f171db3208285d1492401bd185aa0
+
+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)/src && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ \
+               SUBDIRS=$(DIR_APP)/src modules
+       cd $(DIR_APP)/src && install -m 644 e1000e.ko \
+               /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/hso b/lfs/hso
new file mode 100644 (file)
index 0000000..371d1c3
--- /dev/null
+++ b/lfs/hso
@@ -0,0 +1,87 @@
+###############################################################################
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+ifeq "$(XEN)" "1"
+       VERSUFIX = ipfire-xen
+else
+       VERSUFIX = ipfire
+endif
+
+VER        = 1.9
+
+THISAPP    = hso-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/hso_26-v$(VER)
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 6412b24ff8cf0527b52616e335ae24f0
+
+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 jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ \
+               SUBDIRS=$(DIR_APP) modules
+       cd $(DIR_APP) && install -m 644 hso.ko \
+               /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/usb
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index fe07377e92c00a19102444538738373288c9f056..ab5a40fa807887e25d4214bc0ea81664d2b51c68 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -340,6 +340,8 @@ buildipfire() {
   ipfiremake which
   ipfiremake linux-xen
   ipfiremake atl2                      XEN=1
+  ipfiremake hso                       XEN=1
+  ipfiremake e1000e                    XEN=1
   ipfiremake kqemu                     XEN=1
   ipfiremake v4l-dvb                   XEN=1
   ipfiremake madwifi                   XEN=1
@@ -349,6 +351,8 @@ buildipfire() {
   ipfiremake compat-wireless           XEN=1
   ipfiremake linux
   ipfiremake atl2
+  ipfiremake hso
+  ipfiremake e1000e
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi