kernel3: updated to 3.2.21.

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

diff --git a/lfs/linux3 b/lfs/linux3
index 94233dc5479cd4b99e1e68e3589385dc177464fe..08620280683172712392dc2acd66679d48343692 100644 (file)
--- a/lfs/linux3
+++ b/lfs/linux3
@@ -24,20 +24,12 @@
 
 include Config
 
-PATCHLEVEL = .20
+VER           = 3.2.21
 
-VER           = 2.6.42.20
-
-XVERS         = 3.2.20
-XVERSION      = 2
-XPATCHLEVEL   = 6
-XSUBLEVEL     = 42
-XEXTRAVERSION = .20
-
-RPI_PATCHES = linux-3.2-bootc-6ab6087
+RPI_PATCHES = linux-3.2-bootc-a1f8d7a
 
 THISAPP    = linux-$(VER)
-DL_FILE    = linux-$(XVERS).tar.bz2
+DL_FILE    = linux-$(VER).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
@@ -83,8 +75,8 @@ objects =$(DL_FILE) \
 $(DL_FILE)                             = $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz    = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                         = bd0063a747c3ea0ecdcc85a512d9760a
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = fd87188cbd0b168a2b335db3d661ece9
+$(DL_FILE)_MD5                         = c8a4ae25eb44f9122f386068e30e7e2e
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = c3891a7f38609783358e765d784e5e6e
 
 install : $(TARGET)
 
@@ -117,13 +109,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
-       # Change version from 3.x to 2.6.4x
-       cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^VERSION =.*$$/VERSION = $(XVERSION)/g" Makefile
-       cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^PATCHLEVEL =.*$$/PATCHLEVEL = $(XPATCHLEVEL)/g" Makefile
-       cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^SUBLEVEL =.*$$/SUBLEVEL = $(XSUBLEVEL)/g" Makefile
-       cd $(DIR_SRC)/linux-$(XVERS) && sed -i -e "s/^EXTRAVERSION =.*$$/EXTRAVERSION = $(XEXTRAVERSION)/g" Makefile
-       mv $(DIR_SRC)/linux-$(XVERS) $(DIR_SRC)/linux-$(VER)
-
        ln -svf linux-$(VER) $(DIR_SRC)/linux
 
        # Linux Intermediate Queueing Device
@@ -132,7 +117,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Not report deprecated syscall 1.23 (for kudzu)
 #      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
 
-
        # ipp2p 0.8.2-ipfire
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.0-ipp2p-0.8.2-ipfire.patch
 
@@ -169,11 +153,10 @@ ifeq "$(KCFG)" "-omap"
 endif
 
 ifeq "$(KCFG)" "-rpi"
-       # Apply Raspberry Pi kernel patches. (only avail for 3.1.x kernel yet)
+       # Apply Raspberry Pi kernel patches.
        cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-alsamixer.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-limit_volume.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2708-sdhci_patches.patch
 endif
 
 ifeq "$(HEADERS)" "1"
@@ -192,7 +175,7 @@ else
        cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
        cd $(DIR_APP) && make CC="$(KGCC)" oldconfig
        cd $(DIR_APP) && make CC="$(KGCC)" clean
-       cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-$(VERSUFIX)/' Makefile
+       cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile
 
 ifeq "$(KCFG)" "-kirkwood"
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage