kernel: update to 3.14.25.

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

diff --git a/lfs/linux b/lfs/linux
index 52efdbc0a1eeeee3e23f2788cc19ee92cd1ce13e..1e6298c3931c85ce5c370cbb83f39cf80350dd36 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,11 +24,11 @@
 
 include Config
 
-VER        = 3.14.22
+VER        = 3.14.25
 
-RPI_PATCHES = 3.14.22-grsec-ipfire1
-A7M_PATCHES = 3.14.22-grsec-ipfire1
-GRS_PATCHES = grsecurity-3.0-3.14.22-201410192047.patch.xz
+RPI_PATCHES = 3.14.25-grsec-ipfire1
+A7M_PATCHES = 3.14.25-grsec-ipfire1
+GRS_PATCHES = grsecurity-3.0-3.14.25-201411220954.patch.xz
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -37,7 +37,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 52
+PAK_VER    = 53
 DEPS      = ""
 
 VERSUFIX=ipfire$(KCFG)
@@ -77,10 +77,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz         = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).
 arm7-multi-patches-$(A7M_PATCHES).patch.xz     = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
 $(GRS_PATCHES)                                 = $(URL_IPFIRE)/$(GRS_PATCHES)
 
-$(DL_FILE)_MD5                                 = cb00fadd0a720cc2d1690792e72e0134
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = 75adff006d9dbc9be76e6c44eb80698f
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 06cdc33ba0c28b4b5ec876d8f8297b82
-$(GRS_PATCHES)_MD5                             = a63b899587068885951e762ad53f5b50
+$(DL_FILE)_MD5                                 = 3ae910d35292706d85870c3939547123
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = b573af847c28ebed8c15a74542360db1
+arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 8b47b81a530db68cb2c2f6bb6418ca28
+$(GRS_PATCHES)_MD5                             = 6b2c8669e39304cfe647f9de16260929
 
 install : $(TARGET)
 
@@ -147,7 +147,7 @@ endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
 
        # Add LED trigger
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.9-ledtrig-netdev-1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-ledtrig_netdev.patch
 
        # cs5535audio spams syslog if no ac97 was present (geos router)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch
@@ -161,6 +161,7 @@ endif
 
 ifeq "$(KCFG)" "-kirkwood"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch
 endif
 
 ifeq "$(KCFG)" "-multi"
@@ -226,16 +227,6 @@ ifeq "$(MACHINE_TYPE)" "arm"
                        done
 endif
 
-       # Create initramfs images
-       dracut --force --verbose --strip --xz /boot/initramfs-$(KVER)-$(VERSUFIX).img $(KVER)-$(VERSUFIX)
-
-ifeq "$(KCFG)" "-kirkwood"
-       cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
-endif
-
-ifeq "$(KCFG)" "-multi"
-       cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(VERSUFIX)
-endif
 
 ifeq "$(LASTKERNEL)" "1"
        # Only do this once
@@ -264,5 +255,9 @@ ifeq "$(LASTKERNEL)" "1"
 endif
 endif
 
+       #force new build of external modules and initrd if the kernel was rebuild
+       -rm -f /usr/src/log/*-kmod-$(VER)-$(VERSUFIX)
+       -rm -f /usr/src/log/linux-initrd-$(VER)-$(VERSUFIX)
+
        @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
        @$(POSTBUILD)