added pcmcia-support to installer

added Firewire HDD module to core 6

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1157 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/core/6/files b/config/rootfiles/core/6/files
index a6cd391d0d53b165852e21b0ab06c71cd1358285..2e18d32a4fefea5bad4079fb5d7627dfb1f7f704 100644 (file)
--- a/config/rootfiles/core/6/files
+++ b/config/rootfiles/core/6/files
@@ -3,6 +3,8 @@ 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-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/ieee1394/sbp2.ko

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 660dc10941bdcff2183506901042371b17d6820c..1a7bd0401c63f80d7e3bacb9ed7790f67c0fa4a2 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -182,7 +182,6 @@
 * ncftp-3.1.9-src
 * ncurses-5.5
 * neon-0.25.5
-* neon-0.27.2
 * net-tools-1.60
 * newt-0.51.6
 * nfs-utils-1.1.1
@@ -237,7 +236,6 @@
 * squid-graph-3.2
 * squidGuard-1.3
 * subversion-1.4.4
-* subversion-1.4.4_ghjghjghj
 * sudo-1.6.8p12
 * sysfsutils-1.3.0
 * sysklogd-1.4.1

diff --git a/lfs/pcmciautils b/lfs/pcmciautils
index 6c810a9ede38619666de5e0cfe117600027f485a..7feaefe1d6e958d7a723621c9b35ae2b91dcf31a 100644 (file)
--- a/lfs/pcmciautils
+++ b/lfs/pcmciautils
@@ -30,7 +30,12 @@ THISAPP    = pcmciautils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+
+ifeq "$(LFS_PASS)" "install"
+    TARGET     = $(DIR_INFO)/$(THISAPP)-install
+else
+    TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
 
 PROG       = pcmciautils
 PAK_VER    = 1
@@ -77,8 +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"
+       ln -f -s ../../../../../include/sysfs /opt/$(MACHINE)-uClibc/lib/gcc/$(MACHINE)-linux-uclibc/4.0.3/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
        @sed -i -e 's/ MODALIAS=="?[*]",//g' /etc/udev/rules.d/60-pcmcia.rules
+endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index f0c809271231924e2f9e7a2c1a0c82e9901398d9..b3e32127c145698b793e312341627544f089e133 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -572,6 +572,7 @@ buildinstaller() {
   installmake wget
   installmake hwdata
   installmake kudzu
+  installmake pcmciautils
   installmake installer
   installmake initrd
 }