# Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# #
-# Modifications by: #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> #
-# - Modified Makefile for IPCop build #
-# #
-# $Id: linux,v 1.42.2.57 2005/07/28 07:01:27 gespinasse Exp $
-# #
###############################################################################
###############################################################################
include Config
-VER = 2.4.31
+VER = 2.4.33
+PATCHLEVEL = 2.4.33.3
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_KERNEL)/linux/kernel/v2.4
+DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
# Normal build or /tools build.
#
ifeq "$(ROOT)" ""
-ifeq "$(LFS_PASS)" "ipcop"
-ifeq "$(EMB)" ""
- TARGET = $(DIR_INFO)/$(THISAPP)-ipcop
+ifeq "$(LFS_PASS)" "ipfire"
+ifeq "$(SMP)" ""
+ TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)-ipfire
endif
ifeq "$(SMP)" "1"
- TARGET = $(DIR_INFO)/$(THISAPP)-ipcop-smp
+ TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)-ipfire-smp
endif
ifeq "$(SMP)" "installer"
- TARGET = $(DIR_INFO)/$(THISAPP)-ipcop-installer
+ TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)-ipfire-installer
endif
else
- TARGET = $(DIR_INFO)/$(THISAPP)
+ TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)
endif
else
- TARGET = $(DIR_INFO)/$(THISAPP)-tools
+ TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)-tools
endif
###############################################################################
patch-o-matic-ng-20060206.tar.bz2 \
kbc_option_2420.patch \
net4801.kernel.patch_2.4.31 \
- netfilter-layer7-v2.1.tar.gz
+ netfilter-layer7-v2.1.tar.gz \
+ patch-$(PATCHLEVEL).bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-openswan-1.0.10rc2.tar.gz = ftp://ftp.man.szczecin.pl/disks/disk0/security/network-security/ipsec/openswan/openswan-1.0.10rc2.tar.gz
-patch-o-matic-ng-20060206.tar.bz2 = ftp://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/patch-o-matic-ng-20060206.tar.bz2
-iptables-1.3.5.tar.bz2 = http://www.netfilter.org/files/iptables-1.3.5.tar.bz2
-kbc_option_2420.patch = http://developer.osdl.org/rddunlap/patches/kbc_option_2420.patch
-net4801.kernel.patch_2.4.31 = http://www.sk-tech.net/support/net4801.kernel.patch_2.4.31
-netfilter-layer7-v2.1.tar.gz = http://belnet.dl.sourceforge.net/sourceforge/l7-filter/netfilter-layer7-v2.1.tar.gz
-
-$(DL_FILE)_MD5 = ea3f99fc82617886059d58d0644dab26
+patch-$(PATCHLEVEL).bz2 = $(DL_FROM)/patch-$(PATCHLEVEL).bz2
+openswan-1.0.10rc2.tar.gz = $(URL_IPFIRE)/openswan-1.0.10rc2.tar.gz
+patch-o-matic-ng-20060206.tar.bz2 = $(URL_IPFIRE)/patch-o-matic-ng-20060206.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.1.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.1.tar.gz
+
+$(DL_FILE)_MD5 = 4d258d4267de64f0a22e23f6ab026990
+patch-$(PATCHLEVEL).bz2_MD5 = 3597da59e82a495d97e1f0ecd8fc5d4d
openswan-1.0.10rc2.tar.gz_MD5 = 20d51ff963da78f826f4e0f0ebc4bcef
patch-o-matic-ng-20060206.tar.bz2_MD5 = eca9893afb753e331caddfe63142b566
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.1.tar.gz_MD5 = 551626a158c2a2cbfd937d27ecc7fac1
+netfilter-layer7-v2.1.tar.gz_MD5 = 551626a158c2a2cbfd937d27ecc7fac1
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && bzcat $(DIR_DL)/patch-$(PATCHLEVEL).bz2 | patch -p1
+ # 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_SRC) && ln -sf linux-$(VER) linux
cd $(DIR_APP) && sed -i -e 's/-Werror//' drivers/scsi/aic7xxx/Makefile
+ # add IDE SiS 965L support to SiS driver. Request sf#1517522
+ cd $(DIR_SRC) && patch -p0 < $(DIR_SRC)/src/patches/linux-sis-965l.patch
+
# Openswan
cd $(DIR_SRC) && rm -rf openswan-*
- cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-1.0.10rc2.tar.gz
- cd $(DIR_SRC)/openswan-1.0.10rc2 && patch -Np1 < $(DIR_SRC)/src/patches/openswan-1.0.1-plutoctl.patch
- cd $(DIR_SRC)/openswan-1.0.10rc2 && patch -Np1 < $(DIR_SRC)/src/patches/openswan-1.0.6-numif.patch
- cd $(DIR_SRC)/openswan-1.0.10rc2 && sed -i 's+^KERNELSRC.*$$+KERNELSRC=$(ROOT)/usr/src/linux-$(VER)+' Makefile.inc
- cd $(DIR_SRC)/openswan-1.0.10rc2 && sed -i -e 's/local\/sbin/local\/sbin:\/tools\/bin/' utils/patcher
- cd $(DIR_SRC)/openswan-1.0.10rc2 && make insert
-
+ cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-1.0.10.tar.gz
+ cd $(DIR_SRC)/openswan-1.0.10 && patch -Np1 < $(DIR_SRC)/src/patches/openswan-1.0.1-plutoctl.patch
+ cd $(DIR_SRC)/openswan-1.0.10 && patch -Np1 < $(DIR_SRC)/src/patches/openswan-1.0.6-numif.patch
+ cd $(DIR_SRC)/openswan-1.0.10 && sed -i 's+^KERNELSRC.*$$+KERNELSRC=$(ROOT)/usr/src/linux-$(VER)+' Makefile.inc
+ cd $(DIR_SRC)/openswan-1.0.10 && sed -i -e 's/local\/sbin/local\/sbin:\/tools\/bin/' utils/patcher
+ cd $(DIR_SRC)/openswan-1.0.10 && make insert
+
# 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-20060206.tar.bz2
-
+
cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(ROOT)/usr/src/linux/ --iptables-path=$(ROOT)/usr/src/iptables/ pending
cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(ROOT)/usr/src/linux/ --iptables-path=$(ROOT)/usr/src/iptables/ base
cd $(DIR_SRC)/patch-o-matic* && yes 'y' | ./runme --kernel-path=$(ROOT)/usr/src/linux/ --iptables-path=$(ROOT)/usr/src/iptables/ h323-conntrack-nat
cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.1.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.1/kernel-2.4-layer7-2.1.patch
-ifeq "$(EMB)" "1"
- #Emb-patches
- cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/kbc_option_2420.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/net4801.kernel.patch_2.4.31
-endif
+ # ip_conntrack permissions from 440 to 444
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.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.2.11
+ cd $(DIR_SRC) && tar czf $(DIR_DL)/iptables-fixed.tar.gz iptables-1.3.5
endif
# Olitec isdn gazel patch
# R8169 clone D-link GSE-528T
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.4.29_r8169clone.patch
+ # bootsplash
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bootsplash-3.0.7-2.4.31-vanilla.diff
+
# Cleanup kernel source
cd $(DIR_APP) && make mrproper
ifeq "$(ROOT)" ""
-ifeq "$(LFS_PASS)" "ipcop"
+ifeq "$(LFS_PASS)" "ipfire"
ifeq "$(SMP)" ""
cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) $(DIR_APP)/.config
endif
cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
cd $(DIR_APP) && make CC="$(KGCC)" dep
cd $(DIR_APP) && make CC="$(KGCC)" clean
- if [ "$(MACHINE)" = "i386" -a "$(EMB)" = "" ]; then \
+ if [ "$(MACHINE)" = "i386" -a "$(SMP)" = "" ]; then \
cd $(DIR_APP) && make -j 3 CC="$(KGCC)" bzImage; \
cd $(DIR_APP) && cp arch/$(MACHINE)/boot/bzImage /boot/vmlinuz-$(VER); \
cd $(DIR_APP) && cp System.map /boot/System.map-$(VER); \
ln -sf System.map-$(VER) /boot/System.map; \
cd $(DIR_APP) && make CC="$(KGCC)" modules; \
cd $(DIR_APP) && make CC="$(KGCC)" modules_install; \
- elif [ "$(MACHINE)" = "i386" -a "$(EMB)" = "1" ]; then \
- cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =/EXTRAVERSION\ =\ -EMB/' Makefile; \
+ elif [ "$(MACHINE)" = "i386" -a "$(SMP)" = "1" ]; then \
+ cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =/EXTRAVERSION\ =\ -smp/' Makefile; \
cd $(DIR_APP) && make -j 3 CC="$(KGCC)" bzImage; \
- cd $(DIR_APP) && cp arch/$(MACHINE)/boot/bzImage /boot/vmlinuz-$(VER)-EMB; \
- cd $(DIR_APP) && cp System.map /boot/System.map-$(VER)-EMB; \
- ln -sf vmlinuz-$(VER)-EMB /boot/vmlinuz-EMB; \
+ cd $(DIR_APP) && cp arch/$(MACHINE)/boot/bzImage /boot/vmlinuz-$(VER)-smp; \
+ cd $(DIR_APP) && cp System.map /boot/System.map-$(VER)-smp; \
+ ln -sf vmlinuz-$(VER)-smp /boot/vmlinuz-smp; \
cd $(DIR_APP) && make CC="$(KGCC)" modules; \
cd $(DIR_APP) && make CC="$(KGCC)" modules_install; \
- elif [ "$(MACHINE)" = "i386" -a "$(EMB)" = "installer" ]; then \
+ elif [ "$(MACHINE)" = "i386" -a "$(SMP)" = "installer" ]; then \
cd $(DIR_APP) && make -j 3 CC="$(KGCC)" bzImage; \
cd $(DIR_APP) && cp arch/$(MACHINE)/boot/bzImage /boot/vmlinuz-installer; \
elif [ "$(MACHINE)" = "alpha" ]; then \