X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flinux;h=00e39e5df3cee721c139adad5ab28f223b5cf6be;hb=a6e9d42e392aec3e3d0b8655634f1071896725d4;hp=895e2851d30a8a3b08a748d5016ab5ae71d18543;hpb=4602bd1fec29f9c205c4a7647270a35257e1be86;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/lfs/linux b/lfs/linux index 895e2851d3..00e39e5df3 100644 --- a/lfs/linux +++ b/lfs/linux @@ -1,22 +1,20 @@ ############################################################################### -# This file is part of the IPCop Firewall. # # # -# IPCop is free software; you can redistribute it and/or modify # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # +# the Free Software Foundation, either version 3 of the License, or # # (at your option) any later version. # # # -# IPCop is distributed in the hope that it will be useful, # +# This program is distributed in the hope that it will be useful, # # but WITHOUT ANY WARRANTY; without even the implied warranty of # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # GNU General Public License for more details. # # # # You should have received a copy of the GNU General Public License # -# along with IPCop; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Makefiles are based on LFSMake, which is # -# Copyright (C) 2002 Rod Roard # +# along with this program. If not, see . # # # ############################################################################### @@ -26,8 +24,8 @@ include Config -PATCHLEVEL = .42 -VER = 2.6.16.42 +PATCHLEVEL = .21 +VER = 2.6.20.21 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -44,32 +42,36 @@ else TARGET = $(DIR_INFO)/linux-$(VER) endif + ############################################################################### # Top-level Rules ############################################################################### objects =$(DL_FILE) \ - mISDN-CVS-2007-01-26.tar.bz2 \ - squashfs3.2-r2.tar.gz \ - iptables-1.3.7.tar.bz2 \ + mISDN-1_1_5.tar.gz \ + squashfs3.3.tgz \ + iptables-1.3.8.tar.bz2 \ patch-o-matic-ng-20061210.tar.bz2 \ - 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.7.tar.bz2 = $(URL_IPFIRE)/iptables-1.3.7.tar.bz2 -netfilter-layer7-v2.9.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.9.tar.gz + netfilter-layer7-v2.18.tar.gz \ + patch-2.6.16-nath323-1.3.bz2 \ + openswan-2.4.12.tar.gz + +$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) +patch-o-matic-ng-20061210.tar.bz2 = $(URL_IPFIRE)/patch-o-matic-ng-20061210.tar.bz2 +iptables-1.3.8.tar.bz2 = $(URL_IPFIRE)/iptables-1.3.8.tar.bz2 +netfilter-layer7-v2.18.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.18.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 +squashfs3.3.tgz = $(URL_IPFIRE)/squashfs3.3.tgz +mISDN-1_1_5.tar.gz = $(URL_IPFIRE)/mISDN-1_1_5.tar.gz +openswan-2.4.12.tar.gz = $(URL_IPFIRE)/openswan-2.4.12.tar.gz -$(DL_FILE)_MD5 = 87e998bb87839b962702815dd5aecc73 +$(DL_FILE)_MD5 = fbedc192e654735936cc780da8deeba4 patch-o-matic-ng-20061210.tar.bz2_MD5 = 76edac76301b45f89e467b41c8cf4393 -iptables-1.3.7.tar.bz2_MD5 = dd965bdacbb86ce2a6498829fddda6b7 -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 +iptables-1.3.8.tar.bz2_MD5 = 0a9209f928002e5eee9cdff8fef4d4b3 +netfilter-layer7-v2.18.tar.gz_MD5 = 8d2e2c00f5c20e8c0852998035aeffd2 +patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 +squashfs3.3.tgz_MD5 = 95c40fca0d886893631b5de14a0af25b +mISDN-1_1_5.tar.gz_MD5 = 93b1cff7817b82638a0475c2b7b7f1b6 +openswan-2.4.12.tar.gz_MD5 = 0bca0cc205d2d83eff64a7cea825ce7a install : $(TARGET) @@ -98,70 +100,73 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @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 # 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.4.12.tar.gz + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12.kernel-2.6-klips.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12.kernel-2.6.20.21-natt.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12.kernel-2.6.20-cryptoalg.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12-missing-files.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 - # Reiser4 - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.16-5.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.20.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 + cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.3.tgz + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.3/kernel-patches/linux-2.6.20/squashfs3.3-patch + + # ip_conntrack permissions from 440 to 444 + cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch + + # Some VIA patches + #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/padlock-prereq-2.6.16.diff + #cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/epia_dma.patch # Patch-o-matic cd $(DIR_SRC) && rm -rf iptables-* patch-o-matic* - cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.7.tar.bz2 - cd $(DIR_SRC) && ln -sf iptables-1.3.7 iptables - 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/ \ - sip-conntrack-nat rtsp-conntrack-nat \ - mms-conntrack-nat + cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.8.tar.bz2 + cd $(DIR_SRC) && ln -sf iptables-1.3.8 iptables + #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/ \ + # sip-conntrack-nat rtsp-conntrack-nat \ + # mms-conntrack-nat # Layer7-patch - cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.9 - cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.9.tar.gz - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.9/for_older_kernels/kernel-2.6.13-2.6.16-layer7-2.2.patch + cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.18 + cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.18.tar.gz + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.18/for_older_kernels/kernel-2.6.20-2.6.21-layer7-2.16.1.patch # Linux Intermediate Queueing Device - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16-imq2.diff - - # ip_conntrack permissions from 440 to 444 - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch +ifeq "$(XEN)" "" + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20-imq.diff +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_5.tar.gz + cd $(DIR_SRC)/mISDN-1_1_5 && yes 'yes' | ./std2kern -k /usr/src/linux + + cd $(DIR_APP)/drivers/isdn/hardware/mISDN && patch -Np0 < $(DIR_SRC)/src/patches/mISDN-avmfritz.patch ifeq "$(SMP)" "" # Only do this once on the non-SMP pass - cd $(DIR_SRC) && tar czf $(DIR_DL)/iptables-fixed.tar.gz iptables-1.3.7 + cd $(DIR_SRC) && tar czf $(DIR_DL)/iptables-fixed.tar.gz iptables-1.3.8 endif - # Bootsplash - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bootsplash-3.1.6-2.6.15.diff - # Cleanup kernel source cd $(DIR_APP) && make mrproper -ifeq "$(SMP)" "" - cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) $(DIR_APP)/.config -endif ifeq "$(SMP)" "1" cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE).smp $(DIR_APP)/.config +else + cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) $(DIR_APP)/.config endif cd $(DIR_APP) && make CC="$(KGCC)" oldconfig @@ -172,12 +177,9 @@ ifeq "$(SMP)" "1" 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 - cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-ipfire 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 else cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire/' Makefile cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage @@ -185,15 +187,15 @@ 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 endif - # remove symlinked pcmcia directory - -rm -rf /lib/modules/$(VER)-ipfire{,-smp}/pcmcia +ifeq "$(SMP)" "" + # Only do this once on the non-SMP pass + cd $(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)