kernel: Update to 4.3.6

[people/arne_f/ipfire-3.x.git] / kernel / kernel.nm

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 725cac29e2abcb7e21b531f7a83a012da37ea880..ed1f2d0c42e5872e9b3165667362e2514d27e2b4 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kernel
-version    = 3.19.1
+version    = 4.3.6
 release    = 1
 thisapp    = linux-%{version}
 
@@ -25,22 +25,17 @@ end
 localversion = %{release}.%{DISTRO_DISTTAG}.%{DISTRO_ARCH}
 fullver      = %{version}-%{localversion}
 
-source_dl    = http://www.kernel.org/pub/linux/kernel/v3.x/
+source_dl    = http://www.kernel.org/pub/linux/kernel/v4.x/
 sources      = %{thisapp}.tar.xz
 
 build
-       # icecream cannot be used to compile the kernel.
-       # Because the PaX patch does use GCC plugins to harden the kernel which
-       # are not available on the remote compilers, we need to disable it here.
-       export ICECC=no
-
        kernel_logo = /usr/share/pixmaps/kernel-logo.ppm
 
        requires
                asciidoc
                audit-devel
                bc
-               binutils >= 2.23.51.0.3-3
+               binutils >= 2.25
                binutils-devel
                bison
                elfutils-devel
@@ -48,6 +43,7 @@ build
                gcc >= 4.9
                gcc-plugin-devel
                gettext
+               hostname
                libunwind-devel
                ncurses-devel
                net-tools
@@ -55,6 +51,7 @@ build
                pciutils-devel
                perl
                python-devel
+               openssl-devel
                slang-devel
                xmlto
                xz
@@ -74,6 +71,7 @@ build
        # Arguments that are passed to the kernel build command.
        kernel_build_flags =
 
+       kernel_arch = %{DISTRO_PLATFORM}
        kernel_target = bzImage
        kernel_image = arch/%{kernel_arch}/boot/%{kernel_target}
 
@@ -82,14 +80,10 @@ build
                # i686 architecture.
                build_kernel_default = 1
                build_kernel_legacy = 1
-
-               kernel_arch = x86
        end
 
        if "%{DISTRO_ARCH}" == "x86_64"
                build_kernel_default = 1
-
-               kernel_arch = x86
        end
 
        if "%{DISTRO_ARCH}" == "aarch64"
@@ -100,23 +94,10 @@ build
                kernel_target = Image.gz
        end
 
-       if "%{DISTRO_ARCH}" == "armv5tel"
-               # Build a kernel for Marvell Kirkwood-based devices.
-               build_kernel_default = 1
-
-               kernel_arch = arm
-               kernel_target = zImage
-
-               # http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/091404.html
-               kernel_build_flags = KALLSYMS_EXTRA_PASS=1
-       end
-
        if "%{DISTRO_ARCH}" == "armv7hl"
                # Build the default unified kernel.
                build_kernel_default = 1
-               build_kernel_lpae = 1
 
-               kernel_arch = arm
                kernel_target = zImage
        end
 
@@ -135,21 +116,11 @@ build
                kernels += legacy
        end
 
-       # Build lpae kernel
-       if "%{build_kernel_lpae}" == "1"
-               kernels += lpae
-       end
-
        perf_make = make %{MAKETUNING} -C tools/perf V=1 WERROR=0 \
                NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 \
                NO_STRLCPY=1 NO_BIONIC=1 prefix=%{prefix} perfexecdir=lib/perf-core
 
        prepare_cmds
-               rm -f %{DIR_APP}/localversion-grsec
-
-               # Remove -Werror flag to fix ARMv5 build.
-               sed -e "s/-Werror//g" -i grsecurity/Makefile || :
-
                # Disable the colorize plugin.
                # It's generally very nice but it clutters our
                # logfiles.
@@ -570,22 +541,6 @@ packages
                end
        end
 
-       if "%{build_kernel_lpae}" == "1"
-               package kernel-lpae
-                       template KERNEL
-
-                       kernel_name = kernel-lpae
-                       kernel_release = %{fullver}.lpae
-               end
-
-               package kernel-lpae-devel
-                       template KERNELDEVEL
-
-                       kernel_name = kernel-lpae
-                       kernel_release = %{fullver}.lpae
-               end
-       end
-
        package kernel-headers
                summary = Header files of the kernel release %{fullver}.
                desciption = %{summary}