Die IDE/SCSI/SATA/USB-Erkennung erstellt nun schoene Ramdisks :D

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

diff --git a/lfs/linux b/lfs/linux
index e53c6af09c84d791a75bb04a99c9c371e224648a..96e2b4c99ab8833866f5e9ecd61ae3a9e81bd010 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -26,8 +26,8 @@
 
 include Config
 
-PATCHLEVEL = .42
-VER        = 2.6.16.42
+PATCHLEVEL = .50
+VER        = 2.6.16.50
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -50,26 +50,29 @@ endif
 objects =$(DL_FILE) \
        mISDN-CVS-2007-01-26.tar.bz2 \
        squashfs3.2-r2.tar.gz \
-       iptables-1.3.7.tar.bz2 \
+       iptables-1.3.5.tar.bz2 \
        patch-o-matic-ng-20061210.tar.bz2 \
        netfilter-layer7-v2.9.tar.gz \
-       patch-2.6.16-nath323-1.3.bz2
+       patch-2.6.16-nath323-1.3.bz2 \
+       openswan-2.5.13.tar.gz
 
 $(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.7.tar.bz2                 = $(URL_IPFIRE)/iptables-1.3.7.tar.bz2
+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
+openswan-2.5.13.tar.gz                                 = $(URL_IPFIRE)/openswan-2.5.13.tar.gz
 
-$(DL_FILE)_MD5                         = 87e998bb87839b962702815dd5aecc73
+$(DL_FILE)_MD5                         = cc2106c6188675187d636aa518b04958
 patch-o-matic-ng-20061210.tar.bz2_MD5  = 76edac76301b45f89e467b41c8cf4393
-iptables-1.3.7.tar.bz2_MD5                     = dd965bdacbb86ce2a6498829fddda6b7
+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
+openswan-2.5.13.tar.gz_MD5 = b83a42ea00ee24ed34413bc122cada51
 
 install : $(TARGET)
 
@@ -101,11 +104,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        ln -s linux-$(VER) /usr/src/linux
 
+       # An UTF8 patch from LFS
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16.27-utf8_input-1.patch
+
        # Openswan 2
        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_SRC) && tar xfz $(DIR_DL)/openswan-2.5.13.tar.gz
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.5.13.kernel-2.6-klips.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.5.13.kernel-2.6-natt.patch
+
        cd $(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc
 
        # H323 conntrack
@@ -176,8 +183,9 @@ ifeq "$(SMP)" "1"
        ln -sf vmlinuz-$(VER)-ipfire-smp /boot/vmlinuz-ipfire-smp
        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
-       #cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall
+       mkdir -p /usr/src/openswan-2.5.13/modobj26/null
+       cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module
+       cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall
 else
        cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire/' Makefile
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
@@ -185,15 +193,21 @@ else
        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
-       ln -sf System.map-$(VER)-ipfire /boot/System-ipfire.map
+       ln -sf System.map-$(VER)-ipfire /boot/System.map-ipfire
        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
-       #cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall
+       mkdir -p /usr/src/openswan-2.5.13/modobj26/null
+       cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module
+       cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall
 endif
 
        # remove symlinked pcmcia directory
        -rm -rf /lib/modules/$(VER)-ipfire{,-smp}/pcmcia
 
+ifeq "$(SMP)" ""
+       # Only do this once on the non-SMP pass 
+       $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
+endif 
+
        @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*
        @$(POSTBUILD)