Merge branch 'core110'

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

diff --git a/lfs/linux b/lfs/linux
index e9c7007b1414d3b0a18eba20cf60780a4dc567aa..3c85a23bad155d0700b04ed85952f3e99a709bc9 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2017  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        #
@@ -37,13 +37,13 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 72
+PAK_VER    = 73
 DEPS      = ""
 
-KERNEL_ARCH = $(MACHINE)
-
 ifeq "$(MACHINE)" "i586"
        KERNEL_ARCH = i386
+else
+       KERNEL_ARCH = $(MACHINE)
 endif
 
 VERSUFIX=ipfire$(KCFG)
@@ -56,9 +56,19 @@ else
        HEADERS_PREFIX = /usr
 endif
 
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(MACHINE)" "armv5tel"
        HEADERS_ARCH=arm
-else
+endif
+
+ifeq "$(MACHINE)" "aarch64"
+       HEADERS_ARCH=arm64
+endif
+
+ifeq "$(MACHINE)" "x86_64"
+       HEADERS_ARCH=x86
+endif
+
+ifeq "$(MACHINE)" "i586"
        HEADERS_ARCH=x86
 endif
 
@@ -173,6 +183,9 @@ endif
        # update the queued trim blacklist from kernel 4.2rc1
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.43_new_qtrim_blacklist.patch
 
+       # remove eMMC EXT_CSD revision check to use newer eMMC modules
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.79_mmc_remove_EXT_CSD_revision_check.patch
+
        # Hyper-V patches
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0001-Drivers-net-hyperv-Get-rid-of-the-rndis_filter_packe.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0002-Drivers-net-hyperv-Cleanup-the-receive-path.patch
@@ -206,6 +219,9 @@ ifneq "$(KCFG)" "-headers"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0100-crypto-aesni-Add-support-for-192-256-bit-keys-to-AES.patch
 endif
 
+       # fix CVE-2016-5195 (Dirty COW)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0110-mm-remove-gup_flags-FOLL_WRITE-games-from-__get_user.patch
+
        # fix empty symbol crc's
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-genksyms_fix_typeof_handling.patch