From: arne_f Date: Wed, 23 Jan 2008 19:12:11 +0000 (+0000) Subject: Missing files of the last commit X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=cb64537432b22b592a29bd3c05748115ce275d48 Missing files of the last commit git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1153 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/config/rootfiles/packages/pcmciautils b/config/rootfiles/packages/pcmciautils new file mode 100644 index 000000000..03736fafb --- /dev/null +++ b/config/rootfiles/packages/pcmciautils @@ -0,0 +1,25 @@ +#etc/pcmcia +etc/pcmcia/config.opts +etc/udev/rules.d/60-pcmcia.rules +sbin/lspcmcia +sbin/pccardctl +sbin/pcmcia-check-broken-cis +sbin/pcmcia-socket-startup +#usr/share/man/man8/lspcmcia.8 +#usr/share/man/man8/pccardctl.8 +lib/modules/2.6.16.57-ipfire/kernel/drivers/char/pcmcia +lib/modules/2.6.16.57-ipfire/kernel/drivers/ide/legacy/ide-cs.ko +lib/modules/2.6.16.57-ipfire/kernel/drivers/net/pcmcia +lib/modules/2.6.16.57-ipfire/kernel/drivers/scsi/pcmcia +lib/modules/2.6.16.57-ipfire/kernel/drivers/parport/parport_cs.ko +lib/modules/2.6.16.57-ipfire/kernel/drivers/pcmcia +lib/modules/2.6.16.57-ipfire/kernel/drivers/serial/serial_cs.ko +lib/modules/2.6.16.57-ipfire/kernel/sound/pcmcia +lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/char/pcmcia +lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/ide/legacy/ide-cs.ko +lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/pcmcia +lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/scsi/pcmcia +lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/parport/parport_cs.ko +lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/pcmcia +lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/serial/serial_cs.ko +lib/modules/2.6.16.57-ipfire-smp/kernel/sound/pcmcia diff --git a/lfs/mcs7830 b/lfs/mcs7830 new file mode 100644 index 000000000..2d1be4022 --- /dev/null +++ b/lfs/mcs7830 @@ -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 = 060926 + +THISAPP = mcs7830-$(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 = 234b18d71a55ee70b06c87fc4e7516a1 + +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 mcs7830.ko /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/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 +endif + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/pcmciautils b/lfs/pcmciautils new file mode 100644 index 000000000..6c810a9ed --- /dev/null +++ b/lfs/pcmciautils @@ -0,0 +1,84 @@ +############################################################################### +# # +# 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 = 014 + +THISAPP = pcmciautils-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +PROG = pcmciautils +PAK_VER = 1 +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 3f07c926875f6c5dcb83240f39725177 + +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 + cd $(DIR_APP) && make install + @sed -i -e 's/ MODALIAS=="?[*]",//g' /etc/udev/rules.d/60-pcmcia.rules + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/r8168 b/lfs/r8168 new file mode 100644 index 000000000..8a57ec9a6 --- /dev/null +++ b/lfs/r8168 @@ -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 = 8.004.00 + +THISAPP = r8168-$(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 = fedefbeab3e2f09ad9b2ce7b4f90f094 + +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)/src && make -C /lib/modules/$(KVER)-ipfire-smp/build/ SUBDIRS=$(DIR_APP)/src modules + cd $(DIR_APP)/src && install -m 644 r8168.ko /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/net +else + cd $(DIR_APP) && make clean + cd $(DIR_APP)/src && make -C /lib/modules/$(KVER)-ipfire/build/ SUBDIRS=$(DIR_APP)/src modules + cd $(DIR_APP)/src && install -m 644 r8168.ko /lib/modules/$(KVER)-ipfire/kernel/drivers/net +endif + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/r8169 b/lfs/r8169 new file mode 100644 index 000000000..090aa7a58 --- /dev/null +++ b/lfs/r8169 @@ -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 = 6.004.00 + +THISAPP = r8169-$(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 = c1e90e829d945953b3c997c766cec90c + +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) && patch -N -p1 < $(DIR_SRC)/src/patches/$(THISAPP)-dlink.patch + +ifeq "$(SMP)" "1" + cd $(DIR_APP) && make clean + cd $(DIR_APP)/src && make -C /lib/modules/$(KVER)-ipfire-smp/build/ SUBDIRS=$(DIR_APP)/src modules + cd $(DIR_APP)/src && install -m 644 r8169.ko /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/net +else + cd $(DIR_APP) && make clean + cd $(DIR_APP)/src && make -C /lib/modules/$(KVER)-ipfire/build/ SUBDIRS=$(DIR_APP)/src modules + cd $(DIR_APP)/src && install -m 644 r8169.ko /lib/modules/$(KVER)-ipfire/kernel/drivers/net +endif + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/src/paks/pcmciautils/install.sh b/src/paks/pcmciautils/install.sh new file mode 100644 index 000000000..b1519de8f --- /dev/null +++ b/src/paks/pcmciautils/install.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +depmod -a diff --git a/src/paks/pcmciautils/uninstall.sh b/src/paks/pcmciautils/uninstall.sh new file mode 100644 index 000000000..d18072684 --- /dev/null +++ b/src/paks/pcmciautils/uninstall.sh @@ -0,0 +1,28 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/etc/init.d/mldonkey stop +remove_files +depmod -a + diff --git a/src/paks/pcmciautils/update.sh b/src/paks/pcmciautils/update.sh new file mode 100644 index 000000000..6e770fbf3 --- /dev/null +++ b/src/paks/pcmciautils/update.sh @@ -0,0 +1,25 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +depmod -a diff --git a/src/patches/kudzu-mcs7830.patch b/src/patches/kudzu-mcs7830.patch new file mode 100644 index 000000000..f170bef7c --- /dev/null +++ b/src/patches/kudzu-mcs7830.patch @@ -0,0 +1,11 @@ +diff -Naur kudzu.org/usb.c kudzu-1.2.64/usb.c +--- kudzu-1.2.64/usb.c 2006-11-28 17:58:58.000000000 +0100 ++++ kudzu-1.2.64/usb.c 2007-11-29 09:24:35.000000000 +0100 +@@ -268,6 +268,7 @@ + !strcmp(t->driver, "ax8817x") || + !strcmp(t->driver, "zd1201") || + !strcmp(t->driver, "asix") || ++ !strcmp(t->driver, "mcs7830") || + !strcmp(t->driver, "usbnet"))) { + if (t->type == CLASS_OTHER) + t->type = CLASS_NETWORK; diff --git a/src/patches/r8169-6.004.00-dlink.patch b/src/patches/r8169-6.004.00-dlink.patch new file mode 100644 index 000000000..ceddffa03 --- /dev/null +++ b/src/patches/r8169-6.004.00-dlink.patch @@ -0,0 +1,13 @@ +diff -Naur r8169-6.004.00.org/src/r8169_n.c r8169-6.004.00/src/r8169_n.c +--- r8169-6.004.00.org/src/r8169_n.c 2007-11-08 18:01:13.000000000 +0100 ++++ r8169-6.004.00/src/r8169_n.c 2008-01-19 12:06:42.000000000 +0100 +@@ -109,6 +109,9 @@ + static struct pci_device_id rtl8169_pci_tbl[] = { + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 }, + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 }, ++ { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 }, ++ { PCI_DEVICE(0x16ec , 0x0116), 0, 0, RTL_CFG_0 }, ++ { PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0024, 0,0, RTL_CFG_0 }, + {0,}, + }; +