Hinzugefuegt:

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

diff --git a/lfs/linux b/lfs/linux
index c9144b30ab7570b233a352bfa72ba98ec9734c66..59a0b9b3144c9238e477c99c92697f6354430999 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -26,7 +26,8 @@
 
 include Config
 
-VER        = 2.4.31
+VER        = 2.4.33
+PATCHLEVEL = 2.4.33.3
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,19 +41,19 @@ CXXFLAGS   =
 ifeq "$(ROOT)" ""
 ifeq "$(LFS_PASS)" "ipfire"
 ifeq "$(SMP)" ""
-  TARGET = $(DIR_INFO)/$(THISAPP)-ipfire
+  TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)-ipfire
 endif
 ifeq "$(SMP)" "1"
-  TARGET = $(DIR_INFO)/$(THISAPP)-ipfire-smp
+  TARGET = $(DIR_INFO)/linux-$(PATCHLEVEL)-ipfire-smp
 endif
 ifeq "$(SMP)" "installer"
-  TARGET = $(DIR_INFO)/$(THISAPP)-ipfire-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
 
 ###############################################################################
@@ -64,9 +65,11 @@ objects =$(DL_FILE) \
        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)
+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
@@ -74,7 +77,8 @@ 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                         = ea3f99fc82617886059d58d0644dab26
+$(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
@@ -110,9 +114,17 @@ $(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)
+       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.10.tar.gz
@@ -156,9 +168,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # ip_conntrack permissions from 440 to 444
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
 
-       # give kernel the name ipfire
-       # cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/linux-2.4.31-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.3.5
@@ -186,6 +195,9 @@ 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)" ""