SquashFS hinzugefuegt damit wir auf OpenVZ-Maschinen bauen koennen.

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

diff --git a/lfs/linux b/lfs/linux
index 74e92c6ac723fe12c792d1bd68291a77db8aacc3..97a3f6f6f0f5123014ade17d624abc918eed2d96 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -27,7 +27,7 @@
 include Config
 
 VER        = 2.6.16
-PATCHLEVEL = 2.6.16.27
+PATCHLEVEL = 2.6.16.29
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -55,6 +55,7 @@ objects =$(DL_FILE) \
        kbc_option_2420.patch \
        net4801.kernel.patch_2.4.31 \
        netfilter-layer7-v2.6.tar.gz \
+       patch-2.6.16-nath323-1.3.bz2 \
        patch-$(PATCHLEVEL).gz
 
 $(DL_FILE)                                     = $(DL_FROM)/$(DL_FILE)
@@ -66,9 +67,10 @@ iptables-1.3.5.tar.bz2                       = $(URL_IPFIRE)/iptables-1.3.5.tar.bz2
 kbc_option_2420.patch                  = $(URL_IPFIRE)/kbc_option_2420.patch
 net4801.kernel.patch_2.4.31                    = $(URL_IPFIRE)/net4801.kernel.patch_2.4.31
 netfilter-layer7-v2.6.tar.gz           = $(URL_IPFIRE)/netfilter-layer7-v2.6.tar.gz
+patch-2.6.16-nath323-1.3.bz2           = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 
 $(DL_FILE)_MD5                                 = 50695965725367f39007023feac5e256
-patch-$(PATCHLEVEL).gz_MD5                             = 4b09dd018286850c20c0f051ced7b583
+patch-$(PATCHLEVEL).gz_MD5                             = 1355ebc25ea57df398d20e1c1726ec9b
 openswan-2.4.7.kernel-2.6-natt.patch.gz_MD5    = 980d8bbdb29a761b7f5aa852f373df62
 openswan-2.4.7.kernel-2.6-klips.patch.gz_MD5   = 5df0ffa2453488a407a23fc4ea4af879
 patch-o-matic-ng-20061210.tar.bz2_MD5          = 76edac76301b45f89e467b41c8cf4393
@@ -76,6 +78,7 @@ iptables-1.3.5.tar.bz2_MD5                            = 00fb916fa8040ca992a5ace56d905ea5
 kbc_option_2420.patch_MD5                              = 6d37870344f7fcf97ace1fbf43323c60
 net4801.kernel.patch_2.4.31_MD5                        = c7d64e3caedb2f2b10e1c11db7f73a04
 netfilter-layer7-v2.6.tar.gz_MD5                       = 58135cd1aafaf4ae2fa478159206f064
+patch-2.6.16-nath323-1.3.bz2_MD5                       = f926409ff703a307baf54b57ab75d138
 
 install : $(TARGET)
 
@@ -124,38 +127,31 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && gzip -dc $(DIR_DL)/openswan-2.4.7.kernel-2.6-klips.patch.gz | patch -Np1
        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
+
        # Patch-o-matic
        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_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 h323-conntrack-nat cuseeme-nat \
-                       sip-conntrack-nat 
-                       # rtsp-conntrack-nat quake3-conntrack-nat mms-conntrack-nat
-
-#      cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(DIR_APP) --iptables-path=$(ROOT)/usr/src/iptables/ pending
-#      cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(DIR_APP) --iptables-path=$(ROOT)/usr/src/iptables/ base
-#      cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(DIR_APP) --iptables-path=$(ROOT)/usr/src/iptables/ mms-conntrack-nat
-#      cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(DIR_APP) --iptables-path=$(ROOT)/usr/src/iptables/ pptp-conntrack-nat
-#      cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(DIR_APP) --iptables-path=$(ROOT)/usr/src/iptables/ rtsp-conntrack
-#      cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(DIR_APP) --iptables-path=$(ROOT)/usr/src/iptables/ quake3-conntrack-nat
-#      cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(DIR_APP) --iptables-path=$(ROOT)/usr/src/iptables/ ip_queue_vwmark
-#      cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(DIR_APP) --iptables-path=$(ROOT)/usr/src/iptables/ ipp2p
-#      cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(DIR_APP) --iptables-path=$(ROOT)/usr/src/iptables/ ipsec-01-output-hooks
-#      cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(DIR_APP) --iptables-path=$(ROOT)/usr/src/iptables/ ipsec-02-input-hooks
-#      cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(DIR_APP) --iptables-path=$(ROOT)/usr/src/iptables/ ipsec-03-policy-lookup
-#      cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(DIR_APP) --iptables-path=$(ROOT)/usr/src/iptables/ ipsec-04-policy-checks
-       
+                       TARPIT sip-conntrack-nat rtsp-conntrack-nat \
+                       mms-conntrack-nat #quake3-conntrack-nat
+
        # Layer7-patch
        cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.6.tar.gz
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.6/for_older_kernels/kernel-2.6.13-2.6.16-layer7-2.2.patch
 
        # ip_conntrack permissions from 440 to 444
-       # cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
+       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
 
 ifeq "$(SMP)" ""
        # Only do this once on the non-SMP pass
@@ -208,5 +204,5 @@ endif
 ifeq "$(SMP)" "1"
        rm -rf /lib/modules/$(VER)-smp/pcmcia
 endif
-       @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables*
+       @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs*
        @$(POSTBUILD)