dhcp: fix build with linux3.x.

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

diff --git a/lfs/linux b/lfs/linux
index 1f9916e0d741cd0712b68a586771e8acb429e0d3..fc60de2238c951c9fb8fbe662f12cac93ae88c8b 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2012  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,32 +24,23 @@
 
 include Config
 
-PATCHLEVEL = .45
-VER        = 2.6.32.45
+PATCHLEVEL = .59
+VER        = 2.6.32.59
 
 THISAPP    = linux-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PROG      = linux-xen
-PAK_VER    = 19
+PAK_VER    = 20
 DEPS      = ""
 
 # Normal build or XEN build.
 #
 
-ifeq "$(PAE)" "1"
-       VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
-       VERSUFIX=ipfire-xen
-else
-       VERSUFIX=ipfire
-endif
-endif
+VERSUFIX=ipfire$(KCFG)
 
 ifeq "$(HEADERS)" "1"
 ifeq "$(TOOLS)" "1"
@@ -63,12 +54,19 @@ else
        TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
 endif
 
-ifeq "$(MACHINE)" "arm"
+ifeq "$(MACHINE_TYPE)" "arm"
        HEADERS_ARCH=arm
 else
        HEADERS_ARCH=x86
 endif
 
+ifeq "$(KCFG)" ""
+LASTKERNEL=1
+endif
+ifeq "$(KCFG)" "-kirkwood"
+LASTKERNEL=1
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -84,7 +82,7 @@ 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-2f.tar.bz2          = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
 
-$(DL_FILE)_MD5                         = d41f1c7e704cc95fdfc3374367b6fd64
+$(DL_FILE)_MD5                         = 69c68c4a8eb0f04b051a7dbcff16f6d0
 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
@@ -123,7 +121,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        ln -svf linux-$(VER) $(DIR_SRC)/linux
 
-ifeq "$(XEN)" "1"
+ifeq "$(KCFG)" "-xen"
        # Apply gentoo Xen patches
        mkdir -p $(DIR_SRC)/xen-patches
        cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2f.tar.bz2
@@ -165,11 +163,17 @@ endif
        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
 
-ifeq "$(MACHINE)" "arm"
-       # Add dreamplug support on ARM
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.45-arm_kirkwood_dreamplug.patch
+       # Fix mv_cesa
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-crypto-mv_cesa.patch
+
+ifeq "$(KCFG)" "-kirkwood"
+       # Add dreamplug,guruplug and icy 62x0  support on ARM-kirkwood
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.57-arm_kirkwood_setups.patch
 endif
 
+ifeq "$(MACHINE_TYPE)" "arm"
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.45_align_ssb_modtable_32bit_boundary.patch
+endif
 
 ifeq "$(HEADERS)" "1"
        # Install the header files
@@ -189,17 +193,23 @@ else
        cd $(DIR_APP) && make CC="$(KGCC)" clean
        cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-$(VERSUFIX)/' Makefile
 
-ifeq "$(XEN)" "1"
+ifeq "$(KCFG)" "-xen"
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" vmlinuz
        cd $(DIR_APP) && cp -v arch/i386/boot/vmlinuz /boot/vmlinuz-$(VER)-$(VERSUFIX)
 else
-ifeq "$(MACHINE)" "arm"
+ifeq "$(KCFG)" "-kirkwood"
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage
        cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
+       cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX)
+else
+ifeq "$(KCFG)" "-versatile"
+       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage
+       cd $(DIR_APP) && cp -v arch/arm/boot/zImage /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
+endif
 endif
        cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)
@@ -209,9 +219,8 @@ endif
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install
 
-ifneq "$(PAE)" "1"
-ifneq "$(XEN)" "1"
-       # Only do this once on the standard kernel pass
+ifeq "$(LASTKERNEL)" "1"
+       # Only do this once
        cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
 
        # Blacklist matroxfb_base
@@ -234,15 +243,13 @@ ifneq "$(XEN)" "1"
 
        # 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
 
-ifneq "$(MACHINE)" "arm"
+ifneq "$(MACHINE_TYPE)" "arm"
        # Disable geode_aes modul
        mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \
            /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko.off