From 1ca3a3eec64e12f02b8e5ebe89af9b416012863a Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Tue, 26 Mar 2024 15:11:03 -0400 Subject: [PATCH] jjb: Correct param builds for linux 6.9-rc1 Change-Id: I04033db3ee27388d995e7009bc3a739c70f62af5 Signed-off-by: Kienan Stewart --- scripts/lttng-modules/param-build.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh index cf3689d..ba93fd4 100644 --- a/scripts/lttng-modules/param-build.sh +++ b/scripts/lttng-modules/param-build.sh @@ -810,7 +810,7 @@ build_linux_kernel() { scripts/config --disable CONFIG_MICREL_PHY - # IGBVF won't build with recent gcc on 2.6.38.x + # IGBVF won't build with recent gcc on 2.6.38.2 if { vergte "$kversion" "2.6.37" && verlt "$kversion" "2.6.38"; }; then scripts/config --disable CONFIG_IGBVF fi @@ -832,6 +832,12 @@ build_linux_kernel() { scripts/config --enable CONFIG_EVENT_TRACING scripts/config --enable CONFIG_KRETPROBES + # Starting in linux 6.9-rc1, TRIM_UNUSED_SYMS seems to be true + # for out build configurations. In earlier versions the default + # was set depending on the value of `COMPILE_TEST`. + # See upstream commit d2d5cba5d92c4ed23caa86228a1bc31b07e90fe9. + scripts/config --disable CONFIG_TRIM_UNUSED_KSYMS + if [ -n "${DEBUG}" ] ; then cat .config fi -- 2.34.1