Unbenutztes Nash geloescht.

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

diff --git a/lfs/linux b/lfs/linux
index fdeeb9e146baca22db75f4ea1f87de59738aa73d..c55f57b74919f443095cb421dc11fcea24de7f2c 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -53,7 +53,7 @@ endif
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-       mISDN-CVS-2007-01-26.tar.bz2 \
+       mISDN-1_1_3.tar.gz \
        squashfs3.2-r2.tar.gz \
        iptables-1.3.5.tar.bz2 \
        patch-o-matic-ng-20061210.tar.bz2 \
@@ -67,7 +67,7 @@ iptables-1.3.5.tar.bz2                                                = $(URL_IPFIRE)/iptables-1.3.5.tar.bz2
 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.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
+mISDN-1_1_3.tar.gz                = $(URL_IPFIRE)/mISDN-1_1_3.tar.gz
 openswan-2.5.13.tar.gz                                         = $(URL_IPFIRE)/openswan-2.5.13.tar.gz
 
 $(DL_FILE)_MD5                                                                         = cc2106c6188675187d636aa518b04958
@@ -77,7 +77,7 @@ 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
+mISDN-1_1_3.tar.gz_MD5           = d29bcf48f16fc8a9b9f3552d111b308d
 openswan-2.5.13.tar.gz_MD5                             = b83a42ea00ee24ed34413bc122cada51
 
 install : $(TARGET)
@@ -110,8 +110,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        ln -s linux-$(VER) /usr/src/linux
        
-       # XEN
 ifeq "$(XEN)" "1"
+       # XEN
        -cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/xen-3.0.4-2.6.16.x.patch
        cd $(DIR_APP)/net/ipv4/netfilter && patch -Np0 < $(DIR_SRC)/src/patches/xen-3.0.4-netfilter-fix.patch
 endif
@@ -138,6 +138,9 @@ endif
        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
 
+       # ip_conntrack permissions from 440 to 444
+       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
+
        # Patch-o-matic
        cd $(DIR_SRC) && rm -rf iptables-* patch-o-matic*
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.5.tar.bz2
@@ -162,8 +165,8 @@ endif
 
        # mISDN
        cd $(DIR_SRC) && rm -rf mISDN-*
-       cd $(DIR_SRC) && tar xfj $(DIR_DL)/mISDN-CVS-2007-01-26.tar.bz2
-       cd $(DIR_SRC)/mISDN-CVS-2007-01-26 && yes 'yes' | ./std2kern -k /usr/src/linux
+       cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_3.tar.gz
+       cd $(DIR_SRC)/mISDN-1_1_3 && yes 'yes' | ./std2kern -k /usr/src/linux
 
 ifeq "$(SMP)" ""
        # Only do this once on the non-SMP pass
@@ -188,8 +191,8 @@ endif
 
 ifeq "$(SMP)" "1"
        cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire-smp/' Makefile
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" vmlinuz
-       cd $(DIR_APP) && cp -v vmlinuz /boot/vmlinuz-$(VER)-ipfire-smp
+       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
+       cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire-smp
        cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire-smp
        ln -sf vmlinuz-$(VER)-ipfire-smp /boot/vmlinuz-ipfire-smp
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
@@ -200,13 +203,13 @@ ifeq "$(XEN)" "1"
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" vmlinuz
        cd $(DIR_APP) && cp -v vmlinuz /boot/vmlinuz-$(VER)-ipfire-xen
        cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire-xen
-       ln -sf vmlinuz-$(VER)-ipfire-smp /boot/vmlinuz-ipfire-xen
+       ln -sf vmlinuz-$(VER)-ipfire-xen /boot/vmlinuz-ipfire-xen
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
 else
        cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire/' Makefile
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" vmlinuz
-       cd $(DIR_APP) && cp -v vmlinuz /boot/vmlinuz-$(VER)-ipfire
+       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
+       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-ipfire
@@ -220,8 +223,10 @@ endif
        -rm -rf /lib/modules/$(VER)-ipfire{,-smp}/pcmcia
 
 ifeq "$(SMP)" ""
+ifeq "$(XEN)" ""
        # Only do this once on the non-SMP pass 
        cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
+endif
 endif 
 
        @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*