kernel: Don't overwrite CFLAGS and LDFLAGS in Makefile

It was intended that the CFLAGS and LDFLAGS are cleared from any (userspace)
hardening, but since 4.16, the kernel build results in a diffent kernel
that doesn't boot when these flags are cleared.

Fixes: #11817 - Update to Linux 4.18.x
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 90e5368611bcb09f360d2ed9d66b8748b0e71aec..6b959ce583d6d935bb20341c4ceab421924e9735 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kernel
-version    = 4.18.9
+version    = 4.18.20
 release    = 1
 thisapp    = linux-%{version}
 
@@ -62,10 +62,6 @@ build
        # A list of kernels to build.
        kernels =
 
-       # Arguments that are passed to the kernel build command
-       #  Clearning any host CFLAGS or LDFLAGS for kernel build
-       kernel_build_flags = CFLAGS= LDFLAGS=
-
        kernel_arch = %{DISTRO_PLATFORM}
        kernel_target = bzImage
        kernel_image = arch/%{kernel_arch}/boot/%{kernel_target}
@@ -138,7 +134,6 @@ build
                for kernel in %{kernels}; do
                        configure_kernel ${kernel}
                done
-
        end
 
        build
@@ -166,8 +161,8 @@ build
 
                        # Run the build.
                        make ARCH=%{kernel_arch} olddefconfig >/dev/null
-                       make ARCH=%{kernel_arch} CC="gcc -fno-PIE" %{kernel_target} modules \
-                               %{kernel_build_flags} %{PARALLELISMFLAGS}
+                       make ARCH=%{kernel_arch} %{kernel_target} modules \
+                               %{PARALLELISMFLAGS}
 
                        # Compile Flattened Device Tree database
                        case "${DISTRO_ARCH}" in