From: Arne Fitzenreiter Date: Wed, 5 Aug 2009 18:44:59 +0000 (+0200) Subject: Updated Intel e1000e driver to 1.0.2.5. X-Git-Tag: v2.5-core30~48 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e0dcdcb0e170aa4287de4c14fae6cc766a890893 Updated Intel e1000e driver to 1.0.2.5. --- diff --git a/config/rootfiles/core/30/filelists/files b/config/rootfiles/core/30/filelists/files index 4af6d78dd4..9061a69c04 100644 --- a/config/rootfiles/core/30/filelists/files +++ b/config/rootfiles/core/30/filelists/files @@ -1,3 +1,4 @@ +lib/modules/2.6.27.25-ipfire/kernel/drivers/net/e1000e/e1000e.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 ef8f1cdb1d..1471a8a7cd 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -44,7 +44,6 @@ * as86-0.16.17 * asterisk-1.4.18 * atl2-2.0.5-kmod-2.6.27.25-ipfire -* atl2-2.0.5-kmod-2.6.27.25-ipfire-xen * autoconf-2.59 * automake-1.9.6 * backup-ipfire @@ -69,8 +68,7 @@ * 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 * coreutils-5.96 * cpio-2.6 * cpufrequtils-005 @@ -153,7 +151,6 @@ * kbd-1.12 * klibc-1.5.14 * kqemu-1.4.0pre1-kmod-2.6.27.25-ipfire -* kqemu-1.4.0pre1-kmod-2.6.27.25-ipfire-xen * kudzu-1.2.64 * l7-protocols-2009-05-10 * lame-3.97 @@ -185,7 +182,6 @@ * libxml2-2.6.26 * libxslt-1.1.17 * linux-2.6.27.25-ipfire -* linux-2.6.27.25-ipfire-xen * linux-atm-2.4.1 * linux-libc-headers-2.6.12.0 * lm_sensors-3.0.3 @@ -196,10 +192,8 @@ * lzo-2.02 * m4-1.4.4 * mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.25-ipfire -* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.25-ipfire-xen * mISDNuser.git-54928dec57bc846f2c2186f3640e69a053cd3641 * madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.25-ipfire -* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.25-ipfire-xen * make-3.81 * man-db-2.4.3 * man-pages-2.34 @@ -246,7 +240,6 @@ * openssl-0.9.8k * openswan-2.6.21 * openswan-2.6.21-kmod-2.6.27.25-ipfire -* openswan-2.6.21-kmod-2.6.27.25-ipfire-xen * openvpn-2.0.9 * p7zip_4.65 * pam_mysql-0.7RC1 @@ -322,7 +315,6 @@ * usbutils-0.72 * util-linux-2.12r * v4l-dvb-bff77ec33116-kmod-2.6.27.25-ipfire -* v4l-dvb-bff77ec33116-kmod-2.6.27.25-ipfire-xen * vdr-1.6.0 * vdradmin-am-3.6.4 * vim-7.0 diff --git a/lfs/e1000e b/lfs/e1000e new file mode 100644 index 0000000000..79e50977cc --- /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 . # +# # +############################################################################### + +############################################################################### +# 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/make.sh b/make.sh index fe07377e92..2f67a65759 100755 --- a/make.sh +++ b/make.sh @@ -340,6 +340,7 @@ buildipfire() { ipfiremake which ipfiremake linux-xen ipfiremake atl2 XEN=1 + ipfiremake e1000e XEN=1 ipfiremake kqemu XEN=1 ipfiremake v4l-dvb XEN=1 ipfiremake madwifi XEN=1 @@ -349,6 +350,7 @@ buildipfire() { ipfiremake compat-wireless XEN=1 ipfiremake linux ipfiremake atl2 + ipfiremake e1000e ipfiremake kqemu ipfiremake v4l-dvb ipfiremake madwifi