X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fpcmciautils;h=67ad5601fb8be7b273e49e01fe6a334f0ba7f18b;hp=a3c086204d8084d7121364942d9d32f907b5f4d3;hb=a33199f06367fc95e9fc87c07800617d7948bcea;hpb=a6316ce423a6d559ea026061b689591e8f5872ed

diff --git a/lfs/pcmciautils b/lfs/pcmciautils
index a3c086204d..67ad5601fb 100644
--- a/lfs/pcmciautils
+++ b/lfs/pcmciautils
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# 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 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,12 +30,17 @@ THISAPP    = pcmciautils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
 ifeq "$(LFS_PASS)" "install"
-  TARGET     = $(DIR_INFO)/$(THISAPP)-install
+    TARGET     = $(DIR_INFO)/$(THISAPP)-install
 else
-  TARGET     = $(DIR_INFO)/$(THISAPP)
+    TARGET     = $(DIR_INFO)/$(THISAPP)
 endif
 
+PROG       = pcmciautils
+PAK_VER    = 1
+DEPS       = ""
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -56,6 +59,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist :
+	@$(PAK)
+	
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -76,17 +82,21 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+
 ifeq "$(LFS_PASS)" "install"
-#	cd $(DIR_APP) && make -C cardmgr
-#	cd $(DIR_APP) && mkdir -p /install/misc/bin
-#	cd $(DIR_APP) && install -s -m 0755 cardmgr/cardmgr /install/misc/bin
-#	cd $(DIR_APP) && install -s -m 0755 cardmgr/cardctl /install/misc/bin
+	ln -f -s ../../../../../include/sysfs /opt/$(MACHINE)-uClibc/lib/gcc/$(MACHINE)-linux-uclibc/4.0.4/include/sysfs
+	cd $(DIR_APP) && make
+	cd $(DIR_APP) && install -m 755 pccardctl /install/initrd/sbin/
+	ln -f -s pccardctl /install/initrd/sbin/lspcmcia
+	cd $(DIR_APP) && install -m 755 pcmcia-check-broken-cis /install/initrd/sbin/
+	cd $(DIR_APP) && install -m 755 pcmcia-socket-startup /install/initrd/sbin/
+	cp -f /etc/udev/rules.d/60-pcmcia.rules /install/initrd/etc/udev/rules.d/60-pcmcia.rules
+	mkdir -p /install/initrd/etc/pcmcia
+	cp -f /etc/pcmcia/config.opts /install/initrd/etc/pcmcia/config.opts
 else
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
-
-	# Install our own extra pcmcia configs
-	cp $(DIR_SRC)/src/pcmcia/*.conf /etc/pcmcia
+	@sed -i -e 's/ MODALIAS=="?[*]",//g' /etc/udev/rules.d/60-pcmcia.rules
 endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)