]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - lfs/linux
projects / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update:
[ipfire-2.x.git] / lfs / linux
diff --git a/lfs/linux b/lfs/linux
index b9a3e9b32403b3b678795b3fc00024a5813d57b9..012d8b9af775257150222a54ed7dba028757b498 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -18,12 +18,6 @@
 # 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 $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 2.4.31
+VER        = 2.4.32
 
 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   =
@@ -44,15 +38,15 @@ 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)/$(THISAPP)-ipfire
 endif
-ifeq "$(EMB)" "1"
-  TARGET = $(DIR_INFO)/$(THISAPP)-ipcop-EMB
+ifeq "$(SMP)" "1"
+  TARGET = $(DIR_INFO)/$(THISAPP)-ipfire-smp
 endif
-ifeq "$(EMB)" "installer"
-  TARGET = $(DIR_INFO)/$(THISAPP)-ipcop-installer
+ifeq "$(SMP)" "installer"
+  TARGET = $(DIR_INFO)/$(THISAPP)-ipfire-installer
 endif
 else
   TARGET = $(DIR_INFO)/$(THISAPP)
@@ -73,20 +67,22 @@ objects =$(DL_FILE) \
        netfilter-layer7-v2.1.tar.gz
 
 $(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
+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
+#bootsplash-3.0.7-2.4.31-vanilla.diff  = $(URL_IPFIRE)/bootsplash-3.0.7-2.4.31-vanilla.diff
+
+$(DL_FILE)_MD5                         = f01163f627f47030a50dab6976df2eb7
 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
+#bootsplash-3.0.7-2.4.31-vanilla.diff    = 767c263d1d28827d51abc83945e4b893
 
 install : $(TARGET)
 
@@ -119,22 +115,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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
@@ -159,14 +158,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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 "$(EMB)" ""
-       # Only do this once on the non-EMB pass
+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
 endif
 
@@ -192,17 +188,20 @@ endif
        # 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 "$(EMB)" ""
+ifeq "$(LFS_PASS)" "ipfire"
+ifeq "$(SMP)" ""
        cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE) $(DIR_APP)/.config
 endif
-ifeq "$(EMB)" "1"
-       cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE).EMB $(DIR_APP)/.config
+ifeq "$(SMP)" "1"
+       cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE).smp $(DIR_APP)/.config
 endif
-ifeq "$(EMB)" "installer"
+ifeq "$(SMP)" "installer"
        cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE).installer $(DIR_APP)/.config
        cd $(DIR_APP) && sed -i -e 's/-O2/-Os/g' Makefile
 endif
@@ -210,7 +209,7 @@ 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); \
@@ -218,15 +217,15 @@ endif
                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 \
@@ -239,7 +238,7 @@ endif
                cd $(DIR_APP) && make CC="$(KGCC)" modules_install; \
        fi
        # remove symlinked pcmcia directory
-ifeq "$(EMB)" ""
+ifeq "$(SMP)" ""
        rm -rf /lib/modules/$(VER)/pcmcia
        find /lib/modules/$(VER)/ -name '*.o' -a -type f | xargs gzip -f9
 
@@ -251,21 +250,21 @@ ifeq "$(EMB)" ""
        mv -f  /lib/modules/$(VER)/kernel/drivers/scsi/sym53c8xx_2/* /lib/modules/$(VER)/kernel/drivers/scsi
        rm -rf /lib/modules/$(VER)/kernel/drivers/scsi/sym53c8xx_2
 endif
-ifeq "$(EMB)" "1"
-       rm -rf /lib/modules/$(VER)-EMB/pcmcia
-       find /lib/modules/$(VER)-EMB/ -name '*.o' -a -type f | xargs gzip -f9
+ifeq "$(SMP)" "1"
+       rm -rf /lib/modules/$(VER)-smp/pcmcia
+       find /lib/modules/$(VER)-smp/ -name '*.o' -a -type f | xargs gzip -f9
 
        # Move these SCSI drivers into same directory for probescsi.sh
-       mv -f  /lib/modules/$(VER)-EMB/kernel/drivers/scsi/aic7xxx/*     /lib/modules/$(VER)-EMB/kernel/drivers/scsi
-       rm -rf /lib/modules/$(VER)-EMB/kernel/drivers/scsi/aic7xxx
-       mv -f  /lib/modules/$(VER)-EMB/kernel/drivers/scsi/aacraid/*     /lib/modules/$(VER)-EMB/kernel/drivers/scsi
-       rm -rf /lib/modules/$(VER)-EMB/kernel/drivers/scsi/aacraid
-       mv -f  /lib/modules/$(VER)-EMB/kernel/drivers/scsi/sym53c8xx_2/* /lib/modules/$(VER)-EMB/kernel/drivers/scsi
-       rm -rf /lib/modules/$(VER)-EMB/kernel/drivers/scsi/sym53c8xx_2
+       mv -f  /lib/modules/$(VER)-smp/kernel/drivers/scsi/aic7xxx/*     /lib/modules/$(VER)-smp/kernel/drivers/scsi
+       rm -rf /lib/modules/$(VER)-smp/kernel/drivers/scsi/aic7xxx
+       mv -f  /lib/modules/$(VER)-smp/kernel/drivers/scsi/aacraid/*     /lib/modules/$(VER)-smp/kernel/drivers/scsi
+       rm -rf /lib/modules/$(VER)-smp/kernel/drivers/scsi/aacraid
+       mv -f  /lib/modules/$(VER)-smp/kernel/drivers/scsi/sym53c8xx_2/* /lib/modules/$(VER)-smp/kernel/drivers/scsi
+       rm -rf /lib/modules/$(VER)-smp/kernel/drivers/scsi/sym53c8xx_2
 endif
 
-ifeq "$(EMB)" ""
-       # Only do this once on the non-EMB pass
+ifeq "$(SMP)" ""
+       # Only do this once on the non-SMP pass
        cd $(DIR_APP) && make mandocs
        -mkdir -p /usr/share/man/man9/
        cd $(DIR_APP) && cp -af Documentation/man/* /usr/share/man/man9/
IPFire 2.x development tree