Netzwerkscript beinahe vollendet.

Setup bearbeitet. (Geht schon ganz gut.)
Sonstiges wie immer...


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

lfs/cdrom

@@ -85,7 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	rm -f /tmp/ROOTFILES
 	tar -x -C /tmp -f /$(SNAME).tar
 	rm -f /$(SNAME).tar
-	mkdir /tmp/sys
+	@mkdir /tmp/sys
 	cd /tmp && tar jcf /install/cdrom/$(SNAME)-$(VERSION).tbz2 * && rm -rf *
 
 	# Other files

lfs/configroot

@@ -104,9 +104,6 @@ $(TARGET) :
 	echo  "nameserver    1.2.3.4"	> $(CONFIG_ROOT)/ppp/fake-resolv.conf
 	echo  "DISABLEPING=NO"		> $(CONFIG_ROOT)/optionsfw/settings
 
-	# Symbolic links
-	ln -sf /etc/rc.d/rc.updatered $(CONFIG_ROOT)/dhcpc/dhcpcd.exe
-
 	# Modify variables in header.pl
 	sed -i -e "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" \
 	    -e "s+VERSION+$(VERSION)+g" \

lfs/dhcpcd

@@ -72,8 +72,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix="" --mandir=/usr/share/man --disable-nls
+	cd $(DIR_APP) && ./configure --prefix="" --sysconfdir=$(CONFIG_ROOT) \
+				 --mandir=/usr/share/man --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	ln -sf /etc/rc.d/init.d/network $(CONFIG_ROOT)/dhcpc/dhcpcd.exe
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

lfs/initrd

@@ -141,5 +141,6 @@ $(TARGET) :
 	    cd / && umount /install/mnt && \
 	    losetup -d $$LOOPDEV
 	gzip -9 /install/images/cdinitrd
+	splash -s -f /boot/splash/config/bootsplash-1024x768.cfg >> /install/images/cdinitrd.gz
 
 	@$(POSTBUILD)

lfs/initscripts

@@ -55,6 +55,7 @@ $(TARGET) :
 	install -d -m 755 /etc/rc.d/rc6.d
 	install -d -m 755 /etc/rc.d/rcsysinit.d
 	install -d -m 755 /etc/rc.d/init.d
+	install -d -m 755 /etc/rc.d/helper
 	install -d -m 755 /etc/sysconfig
 
 	for i in $(DIR_SRC)/src/initscripts/init.d/*; do \
@@ -66,6 +67,10 @@ $(TARGET) :
 		install -v -m 644 $$i /etc/sysconfig/; \
 	done
 
+	for i in $(DIR_SRC)/src/initscripts/helper/*; do \
+		install -v -m 755 $$i /etc/rc.d/helper/; \
+	done
+
 	ln -sf ../init.d/sysklogd    /etc/rc.d/rc0.d/K90sysklogd
 	ln -sf ../init.d/sendsignals /etc/rc.d/rc0.d/S60sendsignals
 	ln -sf ../init.d/mountfs     /etc/rc.d/rc0.d/S70mountfs
@@ -105,18 +110,6 @@ $(TARGET) :
 	ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
 	ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S90sysctl
 
-#	-mkdir -p /etc/rc.d/helper
-#	for i in $(DIR_SRC)/src/rc.d/* ; do \
-#	    if [ -f $$i ]; then \
-#	        sed "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i > /etc/rc.d/`basename $$i`; \
-#	    fi; \
-#	done
-#	for i in $(DIR_SRC)/src/rc.d/helper/* ; do \
-#	    if [ -f $$i ]; then \
-#	        sed "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i > /etc/rc.d/helper/`basename $$i`; \
-#	    fi; \
-#	done
-#	chmod -R 755 /etc/rc.d
 #	chgrp nobody /etc/rc.d/rc.red
 #	chmod 4750 /etc/rc.d/rc.red
 	@$(POSTBUILD)

lfs/ipp2p

@@ -62,15 +62,17 @@ $(TARGET) :
 	@rm -rf $(DIR_APP) && mkdir -p $(DIR_APP)
 	@cp -vf $(DIR_SRC)/src/ipp2p/* $(DIR_APP)
 	cd $(DIR_SRC) && rm -rf iptables-*
-	cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.5.tar.bz2
-	cd $(DIR_SRC) && ln -sf iptables-1.3.5 iptables
-	cd $(DIR_APP) && make
+	cd $(DIR_SRC) && tar xfz $(DIR_DL)/iptables-fixed.tar.gz
+	cd $(DIR_SRC) && ln -sf iptables-* iptables
 ifeq "$(SMP)" "1"
+	cd $(DIR_APP) && make ipt_ipp2p.ko
 	cp -f $(DIR_APP)/ipt_ipp2p.ko /lib/modules/$(KVER)-smp/kernel/net/ipv4/netfilter
 else
 ifeq "$(IPT)" "1"
+	cd $(DIR_APP) && make
 	cp -f $(DIR_APP)/libipt_ipp2p.o /lib/iptables
 else
+	cd $(DIR_APP) && make ipt_ipp2p.ko
 	cp -f $(DIR_APP)/ipt_ipp2p.ko /lib/modules/$(KVER)/kernel/net/ipv4/netfilter
 endif
 endif

lfs/iptables

@@ -81,10 +81,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_DL)/netfilter-layer7-v2.1 && cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.1.tar.gz
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.6/iptables-layer7-2.6.patch
 
-#	# Appears that libipt_set/SET maybe a little broken, fix it for now...
-#	cd $(DIR_APP)/extensions && sed -i -e 's/#include\ \"..\/ipset\/libipt_set.h\"//' libipt_set.c
-#	cd $(DIR_APP)/extensions && sed -i -e 's/#include\ \"..\/ipset\/libipt_set.h\"//' libipt_SET.c
-
 	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/iptables-1.3.0-imq1.diff
 	chmod +x $(DIR_APP)/extensions/.IMQ-test*  $(DIR_APP)/extensions/.layer7-test*
 	

lfs/strip

@@ -65,8 +65,8 @@ ifeq "$(LFS_PASS)" "install"
 		-type f \( -name '*.so' -o -name '*.so[\.0-9]*' \) \
 		-exec /tools/bin/strip --strip-debug {} \; 2>/dev/null
 
-	-/tools/bin/strip --strip-all /{,usr/}{,local/}{bin,sbin}/* /install/{initrd,misc}/bin/*
-	-/tools/bin/strip --strip-all /usr/lib/awk/{grcat,pwcat}
-	-/tools/bin/strip --strip-all /usr/lib/gcc/*-linux-gnu/4.0.3/{cc1*,collect2}
+	-/tools/bin/strip --strip-all /{,usr/}{,local/}{bin,sbin}/* /install/{initrd,misc}/bin/* 2>/dev/null
+	-/tools/bin/strip --strip-all /usr/lib/awk/{grcat,pwcat} 2>/dev/null
+	-/tools/bin/strip --strip-all /usr/lib/gcc/*-linux-gnu/4.0.3/{cc1*,collect2} 2>/dev/null
 endif