From c088b14c3a68efaf660e5194f64ffac9ac456521 Mon Sep 17 00:00:00 2001 From: arne_f Date: Sat, 26 Jan 2008 12:24:04 +0000 Subject: [PATCH] prepared build of dm9601 module fixed directory of mcs7380 module added usb-net patched kudzu to core 6 git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1159 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/core/6/files | 5 +- doc/packages-list.txt | 1 + lfs/dm9601 | 92 +++++++++++++++++++ lfs/kudzu | 2 +- lfs/mcs7830 | 4 +- make.sh | 2 + ...kudzu-mcs7830.patch => kudzu-usbnet.patch} | 2 +- 7 files changed, 102 insertions(+), 6 deletions(-) create mode 100644 lfs/dm9601 rename src/patches/{kudzu-mcs7830.patch => kudzu-usbnet.patch} (84%) diff --git a/config/rootfiles/core/6/files b/config/rootfiles/core/6/files index 2e18d32a4..31e0858f7 100644 --- a/config/rootfiles/core/6/files +++ b/config/rootfiles/core/6/files @@ -2,9 +2,10 @@ lib/modules/2.6.16.57-ipfire/kernel/fs/fuse lib/modules/2.6.16.57-ipfire-smp/kernel/fs/fuse lib/modules/2.6.16.57-ipfire/kernel/drivers/net/r8169.ko lib/modules/2.6.16.57-ipfire/kernel/drivers/net/r8168.ko -lib/modules/2.6.16.57-ipfire/kernel/drivers/net/mcs7830.ko +lib/modules/2.6.16.57-ipfire/kernel/drivers/usb/net/mcs7830.ko lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/ieee1394/sbp2.ko lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/r8169.ko lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/r8168.ko -lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/mcs7830.ko +lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/usb/net/mcs7830.ko lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/ieee1394/sbp2.ko +/sbin/kudzu diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 1a7bd0401..2ef6eeccc 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -64,6 +64,7 @@ * dhcp-3.1.0 * dhcpcd-2.0.8 * diffutils-2.8.1 +* dm9601-1.01 * dnsmasq-2.40 * dosfstools-2.11 * e2fsprogs-1.39 diff --git a/lfs/dm9601 b/lfs/dm9601 new file mode 100644 index 000000000..99ac57e9a --- /dev/null +++ b/lfs/dm9601 @@ -0,0 +1,92 @@ +############################################################################### +# # +# 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.01 + +THISAPP = dm9601-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +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 = c84094aea1f89831762eaa5dcc910ccd + +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) + +ifeq "$(SMP)" "1" + cd $(DIR_APP) && make clean + cd $(DIR_APP) && make -C /lib/modules/$(KVER)-ipfire-smp/build/ SUBDIRS=$(DIR_APP) modules + cd $(DIR_APP) && install -m 644 dm9601.ko /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/usb/net +else + cd $(DIR_APP) && make clean + cd $(DIR_APP) && make -C /lib/modules/$(KVER)-ipfire/build/ SUBDIRS=$(DIR_APP) modules + cd $(DIR_APP) && install -m 644 dm9601.ko /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/net +endif + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/kudzu b/lfs/kudzu index b6a1a6677..f66c3252f 100644 --- a/lfs/kudzu +++ b/lfs/kudzu @@ -74,7 +74,7 @@ $(subst %,%_MD5,$(objects)) : $(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/kudzu-mcs7830.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kudzu-usbnet.patch ifeq "$(LFS_PASS)" "install" cd $(DIR_APP) && patch -N < $(DIR_SRC)/src/patches/kudzu-link-lintl.diff cd $(DIR_APP) && make RPM_OPT_FLAGS="-O2 -I/opt/$(MACHINE)-uClibc/include" \ diff --git a/lfs/mcs7830 b/lfs/mcs7830 index 2d1be4022..e5eb43bf8 100644 --- a/lfs/mcs7830 +++ b/lfs/mcs7830 @@ -82,11 +82,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ifeq "$(SMP)" "1" cd $(DIR_APP) && make clean cd $(DIR_APP) && make -C /lib/modules/$(KVER)-ipfire-smp/build/ SUBDIRS=$(DIR_APP) modules - cd $(DIR_APP) && install -m 644 mcs7830.ko /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/net + cd $(DIR_APP) && install -m 644 mcs7830.ko /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/usb/net else cd $(DIR_APP) && make clean cd $(DIR_APP) && make -C /lib/modules/$(KVER)-ipfire/build/ SUBDIRS=$(DIR_APP) modules - cd $(DIR_APP) && install -m 644 mcs7830.ko /lib/modules/$(KVER)-ipfire/kernel/drivers/net + cd $(DIR_APP) && install -m 644 mcs7830.ko /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/net endif @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index b3e32127c..db032cd1c 100755 --- a/make.sh +++ b/make.sh @@ -332,12 +332,14 @@ buildipfire() { ipfiremake r8169 SMP=1 ipfiremake r8168 SMP=1 ipfiremake mcs7830 SMP=1 +# ipfiremake dm9601 SMP=1 ipfiremake linux ipfiremake ipp2p ipfiremake zaptel ipfiremake r8169 ipfiremake r8168 ipfiremake mcs7830 +# ipfiremake dm9601 ipfiremake pkg-config ipfiremake linux-atm ipfiremake cpio diff --git a/src/patches/kudzu-mcs7830.patch b/src/patches/kudzu-usbnet.patch similarity index 84% rename from src/patches/kudzu-mcs7830.patch rename to src/patches/kudzu-usbnet.patch index f170bef7c..a33c6fb70 100644 --- a/src/patches/kudzu-mcs7830.patch +++ b/src/patches/kudzu-usbnet.patch @@ -5,7 +5,7 @@ diff -Naur kudzu.org/usb.c kudzu-1.2.64/usb.c !strcmp(t->driver, "ax8817x") || !strcmp(t->driver, "zd1201") || !strcmp(t->driver, "asix") || -+ !strcmp(t->driver, "mcs7830") || ++ !strcmp(t->driver, "mcs7830") || !strcmp(t->driver, "dm9601") || !strcmp(t->driver, "usbnet"))) { if (t->type == CLASS_OTHER) t->type = CLASS_NETWORK; -- 2.39.2