Reiser4 Implementation abgeschlossen...

[ipfire-2.x.git] / lfs / linux

diff --git a/lfs/linux b/lfs/linux
index ce4e15230d7d9a7493c251938195c20460cab623..3d86d59aac43a798a3dd0fc84d4ebe1bc4896394 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -49,27 +49,27 @@ endif
 ###############################################################################
 objects =$(DL_FILE) \
        mISDN-CVS-2007-01-26.tar.bz2 \
-       squashfs3.0.tar.gz \
+       squashfs3.2-r2.tar.gz \
        iptables-1.3.5.tar.bz2 \
        patch-o-matic-ng-20061210.tar.bz2 \
-       netfilter-layer7-v2.6.tar.gz \
+       netfilter-layer7-v2.9.tar.gz \
        patch-2.6.16-nath323-1.3.bz2
 
 $(DL_FILE)                                     = $(DL_FROM)/$(DL_FILE)
 patch-o-matic-ng-20061210.tar.bz2      = $(URL_IPFIRE)/patch-o-matic-ng-20061210.tar.bz2
 iptables-1.3.5.tar.bz2                 = $(URL_IPFIRE)/iptables-1.3.5.tar.bz2
-netfilter-layer7-v2.6.tar.gz           = $(URL_IPFIRE)/netfilter-layer7-v2.6.tar.gz
+netfilter-layer7-v2.9.tar.gz           = $(URL_IPFIRE)/netfilter-layer7-v2.9.tar.gz
 patch-2.6.16-nath323-1.3.bz2           = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
-squashfs3.0.tar.gz                             = $(URL_IPFIRE)/squashfs3.0.tar.gz
+squashfs3.2-r2.tar.gz                  = $(URL_IPFIRE)/squashfs3.2-r2.tar.gz
 mISDN-CVS-2007-01-26.tar.bz2           = $(URL_IPFIRE)/mISDN-CVS-2007-01-26.tar.bz2
 
-$(DL_FILE)_MD5                                 = 87e998bb87839b962702815dd5aecc73
-patch-o-matic-ng-20061210.tar.bz2_MD5          = 76edac76301b45f89e467b41c8cf4393
-iptables-1.3.5.tar.bz2_MD5                             = 00fb916fa8040ca992a5ace56d905ea5
-netfilter-layer7-v2.6.tar.gz_MD5                       = 58135cd1aafaf4ae2fa478159206f064
-patch-2.6.16-nath323-1.3.bz2_MD5                       = f926409ff703a307baf54b57ab75d138
-squashfs3.0.tar.gz_MD5                         = 9fd05d0bfbb712f5fb95edafea5bc733
-mISDN-CVS-2007-01-26.tar.bz2_MD5                       = 844c70dc851faffcae7549fd738c7b49
+$(DL_FILE)_MD5                         = 87e998bb87839b962702815dd5aecc73
+patch-o-matic-ng-20061210.tar.bz2_MD5  = 76edac76301b45f89e467b41c8cf4393
+iptables-1.3.5.tar.bz2_MD5                     = 00fb916fa8040ca992a5ace56d905ea5
+netfilter-layer7-v2.9.tar.gz_MD5               = ebf9043a5352ebe6dbd721989ef83dee
+patch-2.6.16-nath323-1.3.bz2_MD5               = f926409ff703a307baf54b57ab75d138
+squashfs3.2-r2.tar.gz_MD5                      = bf360b92eba9e6d5610196ce2e02fcd1
+mISDN-CVS-2007-01-26.tar.bz2_MD5               = 844c70dc851faffcae7549fd738c7b49
 
 install : $(TARGET)
 
@@ -105,30 +105,29 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC) && rm -rf openswan-*
        cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.4.7.tar.gz
        #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.7.kernel-2.6-natt.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.7.kernel-2.6-klips.patch
+       #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.7.kernel-2.6-klips.patch
        cd $(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc
 
        # H323 conntrack
        cd $(DIR_APP) && bunzip2 -cd $(DIR_DL)/patch-2.6.16-nath323-1.3.bz2 | patch -Np1
 
-       # SquashFS
-       cd $(DIR_SRC) && rm -rf squashfs*
-       cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.0.tar.gz
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.0/linux-2.6.15/squashfs3.0-patch
-
        # Reiser4
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.16-5.patch
 
+       # SquashFS
+       cd $(DIR_SRC) && rm -rf squashfs*
+       cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.2-r2.tar.gz
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.2-r2/kernel-patches/linux-2.6.16/squashfs3.2-patch
+
        # Patch-o-matic
-       cd $(DIR_SRC) && rm -rf iptables-*
+       cd $(DIR_SRC) && rm -rf iptables-* patch-o-matic*
        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_SRC) && rm -rf patch-o-matic*
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/patch-o-matic-ng-20061210.tar.bz2
        cd $(DIR_SRC)/patch-o-matic-ng* && \
                ./runme --batch --kernel-path=$(ROOT)/usr/src/$(THISAPP)/ \
                        --iptables-path=$(ROOT)/usr/src/iptables/ \
-                       TARPIT sip-conntrack-nat rtsp-conntrack-nat \
+                       sip-conntrack-nat rtsp-conntrack-nat \
                        mms-conntrack-nat
 
        # Layer7-patch
@@ -185,8 +184,8 @@ else
        cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire
        cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire
        cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-ipfire
-       ln -sf vmlinuz-$(VER)-ipfire /boot/vmlinuz
-       ln -sf System.map-$(VER)-ipfire /boot/System.map
+       ln -sf vmlinuz-$(VER)-ipfire /boot/vmlinuz-ipfire
+       ln -sf System.map-$(VER)-ipfire /boot/System-ipfire.map
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
        #cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module