[packages/kernel/LINUX_5_4] - revert CFLAGS change that breaks x32 build

baggins baggins at pld-linux.org
Fri Sep 12 12:41:41 CEST 2025


commit 9467a82c30ba98c9f3ca6ac556e537d04b11c027
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Sep 12 14:41:18 2025 +0200

    - revert CFLAGS change that breaks x32 build

 kernel-small_fixes.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
---
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index a611dd91..5cdef8cc 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -530,3 +530,23 @@ diff -ur linux-5.3/drivers/scsi/aacraid.org/linit.c linux-5.3/drivers/scsi/aacra
  		aac_define_int_mode(dev);
  
  	if (dev->msi_enabled)
+--- linux-5.4/net/bpfilter/Makefile.orig	2025-09-11 10:37:47.000000000 +0200
++++ linux-5.4/net/bpfilter/Makefile	2025-09-12 11:55:46.356661622 +0200
+@@ -5,15 +5,14 @@
+ 
+ hostprogs-y := bpfilter_umh
+ bpfilter_umh-objs := main.o
+-KBUILD_HOSTCFLAGS += -I $(srctree)/tools/include/ -I $(srctree)/tools/include/uapi \
+-			$(filter -m32 -m64, $(KBUILD_CFLAGS))
++KBUILD_HOSTCFLAGS += -I $(srctree)/tools/include/ -I $(srctree)/tools/include/uapi
+ HOSTCC := $(CC)
+ 
+ ifeq ($(CONFIG_BPFILTER_UMH), y)
+ # builtin bpfilter_umh should be compiled with -static
+ # since rootfs isn't mounted at the time of __init
+ # function is called and do_execv won't find elf interpreter
+-KBUILD_HOSTLDFLAGS += -static $(filter -m32 -m64, $(KBUILD_CFLAGS))
++KBUILD_HOSTLDFLAGS += -static
+ endif
+ 
+ $(obj)/bpfilter_umh_blob.o: $(obj)/bpfilter_umh
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/9467a82c30ba98c9f3ca6ac556e537d04b11c027



More information about the pld-cvs-commit mailing list