From 07ef28d5ab7f884f5398d075d0372bf4496d1893 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 28 Sep 2022 07:33:10 +0200
Subject: Fixup

---
 bootstrap | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/bootstrap b/bootstrap
index c7b07dd..26238fc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -505,32 +505,34 @@ cd linux
 
 # Adjust configuration.
 #
-if [ -z "$kernel_source" ]; then
+# Note that we do some of these even for the pre-configured kernel.
+#
+# Note that SECURITY_LOCKDOWN_LSM forces MODULE_SIG ('select' in Kconfig).
+#
+# Generally, if you disable an option but it still appears enabled after
+# the kernel build, search for 'select XXX' in Kconfig* and also disable
+# any found symbols.
+#
+scripts/config --disable KCSAN
+scripts/config --disable SECURITY_LOCKDOWN_LSM
+scripts/config --disable MODULE_SIG
+scripts/config --set-str BUILD_SALT ''
+scripts/config --set-str SYSTEM_TRUSTED_KEYS ''
 
-  # Note that SECURITY_LOCKDOWN_LSM forces MODULE_SIG ('select' in Kconfig).
-  #
-  # Generally, if you disable an option but it still appears enabled after
-  # the kernel build, search for 'select XXX' in Kconfig* and also disable
-  # any found symbols.
-  #
-  scripts/config --disable KCSAN
-  scripts/config --disable SECURITY_LOCKDOWN_LSM
-  scripts/config --disable MODULE_SIG
-  scripts/config --set-str BUILD_SALT ''
-  scripts/config --set-str SYSTEM_TRUSTED_KEYS ''
+scripts/config --enable  INIT_STACK_NONE
+scripts/config --disable INIT_STACK_ALL_PATTERN
+scripts/config --disable INIT_STACK_ALL_ZERO
 
-  scripts/config --enable  INIT_STACK_NONE
-  scripts/config --disable INIT_STACK_ALL_PATTERN
-  scripts/config --disable INIT_STACK_ALL_ZERO
+scripts/config --enable  DEBUG_INFO_NONE
+scripts/config --disable DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT
 
-  scripts/config --enable  DEBUG_INFO_NONE
-  scripts/config --disable DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT
+# aarch64/5.19 additions:
+#
+scripts/config --disable KCOV
+scripts/config --disable SHADOW_CALL_STACK
+scripts/config --disable VIDEO_ADV7511
 
-  # aarch64/5.19 additions:
-  #
-  scripts/config --disable KCOV
-  scripts/config --disable SHADOW_CALL_STACK
-  scripts/config --disable VIDEO_ADV7511
+if [ -z "$kernel_source" ]; then
 
   # Disable sound subsystem/drivers.
   #
@@ -549,6 +551,7 @@ if [ -z "$kernel_source" ]; then
   # Disable wireless network drivers.
   #
   scripts/config --disable CONFIG_WLAN
+
 fi
 
 # Adjust kernel command line size limit.
-- 
cgit v1.1