set version to 2.9 core44

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

diff --git a/lfs/linux b/lfs/linux
index 259f88861756a6bc60a2fb5b3716254baad24f7f..1aec51112e32cfe957bcd34f352e783b146068f3 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
 #                                                                             #
 # 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        #
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .24
-VER        = 2.6.32.24
+PATCHLEVEL = .28
+VER        = 2.6.32.28
 
 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -35,17 +35,21 @@ CFLAGS     =
 CXXFLAGS   =
 
 PROG      = linux-xen
-PAK_VER    = 12
+PAK_VER    = 16
 DEPS      = ""
 
 # Normal build or XEN build.
 #
 
+ifeq "$(PAE)" "1"
+       VERSUFIX=ipfire-pae
+else
 ifeq "$(XEN)" "1"
        VERSUFIX=ipfire-xen
 else
        VERSUFIX=ipfire
 endif
+endif
 
 TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
 
@@ -56,19 +60,19 @@ objects =$(DL_FILE) \
        netfilter-layer7-v2.22.tar.gz \
        patch-2.6.16-nath323-1.3.bz2 \
        reiser4-for-2.6.32.patch.bz2 \
-       xen-patches-2.6.32-2c.tar.bz2
+       xen-patches-2.6.32-2d.tar.bz2
 
 $(DL_FILE)                             = $(URL_IPFIRE)/$(DL_FILE)
 netfilter-layer7-v2.22.tar.gz          = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz
 patch-2.6.16-nath323-1.3.bz2           = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 reiser4-for-2.6.32.patch.bz2           = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
-xen-patches-2.6.32-2c.tar.bz2          = $(URL_IPFIRE)/xen-patches-2.6.32-2c.tar.bz2
+xen-patches-2.6.32-2d.tar.bz2          = $(URL_IPFIRE)/xen-patches-2.6.32-2d.tar.bz2
 
-$(DL_FILE)_MD5                         = bcd2f2b3d6974a9232b9becee8196634
+$(DL_FILE)_MD5                         = 9ee6d4023f34eb055ec32f201b5f9206
 netfilter-layer7-v2.22.tar.gz_MD5      = 98dff8a3d5a31885b73341633f69501f
 patch-2.6.16-nath323-1.3.bz2_MD5       = f926409ff703a307baf54b57ab75d138
 reiser4-for-2.6.32.patch.bz2_MD5       = 3246397973d9271eb8e6d7c97c5d2d91
-xen-patches-2.6.32-2c.tar.bz2_MD5      = 62a75ddcba43894b20f754a94b299ce6
+xen-patches-2.6.32-2d.tar.bz2_MD5      = d1690d2b8b0c9124897981aea505f8f7
 
 install : $(TARGET)
 
@@ -106,7 +110,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(XEN)" "1"
        # Apply gentoo Xen patches
        mkdir -p $(DIR_SRC)/xen-patches
-       cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2c.tar.bz2
+       cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2d.tar.bz2
 
        for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
                echo "*********** [Patch: $$x]"; \
@@ -141,6 +145,14 @@ endif
        # Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch
 
+       # Fix uevent PHYSDEVDRIVER
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
+
+       # Install ipfire logo
+       cd $(DIR_APP) && cp -vf $(DIR_SRC)/config/kernel/ipfire_logo.ppm \
+               drivers/video/logo/logo_linux_clut224.ppm
+
        # Cleanup kernel source
 
        cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
@@ -163,16 +175,11 @@ endif
        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
+ifneq "$(PAE)" "1"
+ifneq "$(XEN)" "1"
+       # Only do this once on the standard kernel pass
        cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
-endif
-
-       # Remove mISDN modules
-       rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
-       rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
 
-ifneq "$(XEN)" "1"
        # Blacklist matroxfb_base
        echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer
        # Blacklist old framebuffer modules
@@ -190,7 +197,16 @@ ifneq "$(XEN)" "1"
                echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \
        done
        sed -i -e "s|.ko||g" /etc/modprobe.d/isdn
+
+       # Disable ipv6 at runtime
+       echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6
+
+endif
 endif
 
+       # 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)