[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 65c2debaaf3d6647009b503eb705a615852b2b55

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2623 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  65c2debaaf3d6647009b503eb705a615852b2b55 (commit)
      from  0c55b410c662bf766ba8ca6133279630bf153410 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 65c2debaaf3d6647009b503eb705a615852b2b55
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Dec 28 23:13:54 2018 +0000

    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(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 kernel/kernel.nm | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 90e536861..6b959ce58 100644
--- 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


hooks/post-receive
--
IPFire 3.x development tree