From 1490b049e5e289235463b2eb3968abf3fc88d651 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kstewart@efficios.com>
Date: Wed, 9 Aug 2023 17:21:35 -0400
Subject: [PATCH] jjb: Build kernels with allmodconfig instead of allyesconfig

allmodconfig will reduce the size the the vmlinuz image and the amount
of symbols the linker and other tools (eg. objtool) need to resolve

Change-Id: Iffcdebad808febcee9805570f30f05e0b5f8f2d8
---
 scripts/lttng-modules/param-build.sh | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index 610bf61..81389bd 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -199,11 +199,6 @@ build_linux_kernel() {
             export ARCH="i386"
         fi
 
-        # allyesconfig is mostly broken for kernels of the 2.6 series
-        if verlt "$kversion" "3.0"; then
-            vanilla_config="defconfig"
-        fi
-
         make "${vanilla_config}"
         ;;
     esac
@@ -310,14 +305,6 @@ build_linux_kernel() {
     scripts/config --enable CONFIG_EVENT_TRACING
     scripts/config --enable CONFIG_KRETPROBES
 
-    # FIXME: disable objtool on vmlinux, it OOMs on allyesconfig
-    sed -i 's/objtool_link vmlinux.o//' scripts/link-vmlinux.sh || true
-    # Starting with v6.1-rc6
-    sed -i 's/^objtool-enabled := .*/objtool-enabled := /' scripts/Makefile.vmlinux_o || true
-
-    # Disable SORTTAB
-    sed -i 's/is_enabled CONFIG_BUILDTIME_TABLE_SORT/is_enabled CONFIG_NONEXISTANT/' scripts/link-vmlinux.sh || true
-
     # Debug
     #cat .config
 
@@ -591,37 +578,37 @@ elif [ "x${arch}" != "x" ]; then
     case "$arch" in
         "i386")
             karch="x86"
-            vanilla_config="allyesconfig"
+            vanilla_config="allmodconfig"
             ubuntu_config="i386-config.flavour.generic"
             ;;
 
         "amd64")
             karch="x86"
-            vanilla_config="allyesconfig"
+            vanilla_config="allmodconfig"
             ubuntu_config="amd64-config.flavour.generic"
             ;;
 
         "armhf")
             karch="arm"
-            vanilla_config="allyesconfig"
+            vanilla_config="allmodconfig"
             ubuntu_config="armhf-config.flavour.generic"
             ;;
 
         "arm64")
             karch="arm64"
-            vanilla_config="allyesconfig"
+            vanilla_config="allmodconfig"
             ubuntu_config="arm64-config.flavour.generic"
             ;;
 
         "powerpc")
             karch="powerpc"
-            vanilla_config="allyesconfig"
+            vanilla_config="allmodconfig"
             ubuntu_config="powerpc-config.flavour.powerpc-smp"
             ;;
 
         "ppc64el")
             karch="powerpc"
-            vanilla_config="allyesconfig"
+            vanilla_config="allmodconfig"
             ubuntu_config="ppc64el-config.flavour.generic"
             ;;
 
-- 
2.34.1