X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flinux;h=96e2b4c99ab8833866f5e9ecd61ae3a9e81bd010;hb=591d0154db8b27d31d4b6843ef130bf751b37454;hp=93a92e35e7a10298767af4878e618539160e3785;hpb=5e2e4494879e722309333cb91017c7225615b0fb;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/lfs/linux b/lfs/linux index 93a92e35e7..c37b411b9b 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,59 +24,53 @@ include Config -VER = 2.6.16 -PATCHLEVEL = 2.6.16.29 +PATCHLEVEL = .42 +VER = 2.6.27.42 THISAPP = linux-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -# Normal build or SMP build. +PROG = linux-xen +PAK_VER = 6 +DEPS = "" + +# Normal build or XEN build. # -ifeq "$(SMP)" "1" - TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)-ipfire-smp +ifeq "$(XEN)" "1" + VERSUFIX=ipfire-xen else - TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)-ipfire + VERSUFIX=ipfire endif +TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX) ############################################################################### # Top-level Rules ############################################################################### objects =$(DL_FILE) \ - openswan-2.4.7.kernel-2.6-natt.patch.gz \ - openswan-2.4.7.kernel-2.6-klips.patch.gz \ - iptables-1.3.5.tar.bz2 \ - patch-o-matic-ng-20061210.tar.bz2 \ - kbc_option_2420.patch \ - net4801.kernel.patch_2.4.31 \ - netfilter-layer7-v2.6.tar.gz \ + squashfs3.4.tar.gz \ + netfilter-layer7-v2.21.tar.gz \ patch-2.6.16-nath323-1.3.bz2 \ - patch-$(PATCHLEVEL).gz - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -patch-$(PATCHLEVEL).gz = $(DL_FROM)/patch-$(PATCHLEVEL).gz -openswan-2.4.7.kernel-2.6-natt.patch.gz = $(URL_IPFIRE)/openswan-2.4.7.kernel-2.6-natt.patch.gz -openswan-2.4.7.kernel-2.6-klips.patch.gz = $(URL_IPFIRE)/openswan-2.4.7.kernel-2.6-klips.patch.gz -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 -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 + reiser4-for-2.6.27.19.patch.bz2 \ + linux-$(VER)-suse_xen_patches.tar.bz2 + +$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) +netfilter-layer7-v2.21.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 +squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz +reiser4-for-2.6.27.19.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2 +linux-$(VER)-suse_xen_patches.tar.bz2 = $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches.tar.bz2 + -$(DL_FILE)_MD5 = 50695965725367f39007023feac5e256 -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 -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 +$(DL_FILE)_MD5 = a33e6b22d70dd010525fc43cdda36792 +netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5 +patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 +squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6 +reiser4-for-2.6.27.19.patch.bz2_MD5 = 22988387f64f299489b90b484b2642cc +linux-$(VER)-suse_xen_patches.tar.bz2_MD5 = 4de1c2e6b5ca32e681acea4d907cec91 install : $(TARGET) @@ -88,6 +80,8 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) +dist: + @$(PAK) ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -107,97 +101,90 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) ln -s linux-$(VER) /usr/src/linux - # Update kernel to latest patchlevel - cd $(DIR_APP) && zcat $(DIR_DL)/patch-$(PATCHLEVEL).gz | patch -p1 - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.16.27-utf8_input-1.patch - # Remove patch level in EXTRAVERSION. - # We want to avoid the need to supply a full kernel - # (installed in a different place) if only one part could be updated - cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =/' Makefile - cd $(DIR_APP) && sed -i -e 's/-Werror//' drivers/scsi/aic7xxx/Makefile - cd $(DIR_APP) && sed -i -e 's/gettext//' scripts/kconfig/lkc.h - - # Openswan 2 - cd $(DIR_SRC) && rm -rf openswan-* - cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.4.7.tar.gz - cd $(DIR_APP) && gzip -dc $(DIR_DL)/openswan-2.4.7.kernel-2.6-natt.patch.gz | patch -Np1 - 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 - - # 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 sip-conntrack-nat rtsp-conntrack-nat \ - mms-conntrack-nat #quake3-conntrack-nat +ifeq "$(XEN)" "1" + # Apply Xen patches (provided by SuSE) + cd $(DIR_SRC) && tar jxf $(DIR_DL)/linux-$(VER)-suse_xen_patches.tar.bz2 + cd $(DIR_SRC)/linux-$(VER)-suse_xen_patches && \ + for x in $$( ./guards $$( ./arch-symbols) < ./series.conf); do \ + patch -d $(DIR_APP) -p1 < $$x || break; \ + done + rm -rf $(DIR_SRC)/linux-*-suse_xen_patches + + # Linux Intermediate Queueing Device + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/imq-skbuff.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.21-imq-test3-xen.patch +else + # Linux Intermediate Queueing Device + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.21-imq-test3.patch +endif - # 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 + # Add Vodafone K3565-Z USB ID's to option driver + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.25-option_add_vf-k3565-z_usbids.patch + + # Add Alix to Led Driver + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.24-leds-alix.patch + + # Patch to fix Intel e100 wake on lan + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.39_e100-wakeonlan-fix.patch - # ip_conntrack permissions from 440 to 444 - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch + # Not report deprecated syscall 1.23 (for kudzu) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch +ifeq "$(XEN)" "" + # Reiser4 + -cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.27.19.patch.bz2 | patch -Np1 -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.5 + # SquashFS (already in Suse Patchset) + cd $(DIR_SRC) && rm -rf squashfs* + cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.4.tar.gz + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.4/kernel-patches/linux-2.6.27-rc4/squashfs3.4-patch endif - # Bootsplash - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bootsplash-3.1.6-2.6.15.diff + # ipp2p 0.8.2-pomng + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.19-ipp2p-0.8.2-pomng.patch + + # Layer7-patch + cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.21 + cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.21.tar.gz + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.21/kernel-2.6.25-2.6.28-layer7-2.21.patch # 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 -endif - + cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config cd $(DIR_APP) && make CC="$(KGCC)" oldconfig cd $(DIR_APP) && make CC="$(KGCC)" clean - if [ "$(SMP)" = "" ]; then \ - cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage; \ - cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER); \ - cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER); \ - cd $(DIR_APP) && cp -v .config /boot/config-$(VER); \ - ln -sf vmlinuz-$(VER) /boot/vmlinuz; \ - ln -sf System.map-$(VER) /boot/System.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; \ - cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall; \ - elif [ "$(SMP)" = "1" ]; then \ - cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =/EXTRAVERSION\ =\ -smp/' Makefile; \ - cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage; \ - cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-smp; \ - cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-smp; \ - cd $(DIR_APP) && cp -v .config /boot/config-$(VER); \ - ln -sf vmlinuz-$(VER)-smp /boot/vmlinuz-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; \ - fi - - # remove symlinked pcmcia directory -ifeq "$(SMP)" "" - rm -rf /lib/modules/$(VER)/pcmcia + cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-$(VERSUFIX)/' Makefile + +ifeq "$(XEN)" "1" + cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" vmlinuz + cd $(DIR_APP) && cp -v arch/i386/boot/vmlinuz /boot/vmlinuz-$(VER)-$(VERSUFIX) +else + cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage + cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX) endif -ifeq "$(SMP)" "1" - rm -rf /lib/modules/$(VER)-smp/pcmcia + cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX) + cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX) + ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX) + ln -sf System.map-$(VER)-$(VERSUFIX) /boot/System.map-$(VERSUFIX) + cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules + cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install + cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install + +ifeq "$(XEN)" "" + # Only do this once on the non-XEN pass + cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/ endif - @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* + + # Rename ide-cd module to match with old kernel + mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd_mod.ko \ + /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd.ko + + # Remove mISDN modules + rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN + rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN + + @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-* @$(POSTBUILD)