Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

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

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 2842e631eb1db7018d34b15f513f85820e011bd4..f408d7138378da1bcfce154f78afe79343931b4b 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kernel
-version    = 3.14.2
+version    = 4.1.3
 release    = 1
 thisapp    = linux-%{version}
 
@@ -25,15 +25,10 @@ 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
@@ -45,6 +40,7 @@ build
                bison
                elfutils-devel
                flex
+               gcc >= 4.9
                gcc-plugin-devel
                gettext
                libunwind-devel
@@ -56,6 +52,7 @@ build
                python-devel
                slang-devel
                xmlto
+               xz
 
                /sbin/depmod
                %{kernel_logo}
@@ -90,6 +87,14 @@ build
                kernel_arch = x86
        end
 
+       if "%{DISTRO_ARCH}" == "aarch64"
+               # Disable for now because it won't compile
+               build_kernel_default = 0
+
+               kernel_arch = arm64
+               kernel_target = Image.gz
+       end
+
        if "%{DISTRO_ARCH}" == "armv5tel"
                # Build a kernel for Marvell Kirkwood-based devices.
                build_kernel_default = 1
@@ -215,7 +220,7 @@ build
 
                        # Compile Flattened Device Tree database
                        case "${DISTRO_ARCH}" in
-                               arm*)
+                               aarch64|arm*)
                                        make ARCH=%{kernel_arch} dtbs
 
                                        mkdir -pv %{BUILDROOT}/boot/dtb-${fullversion}
@@ -288,7 +293,7 @@ build
                                %{BUILDROOT}/usr/lib/modules/${fullversion}/build/include/config/auto.conf
 
                        find %{BUILDROOT}/usr/lib/modules/${fullversion} -name "*.ko" -type f | \
-                               xargs chmod u+x
+                               xargs --no-run-if-empty chmod u+x
 
                        # Move all development files to /usr/src.
                        mkdir -p %{BUILDROOT}/usr/src/kernels