From c0136c08f7d2807e88d4ff0026a9153d3af67d2a Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Mon, 4 Jul 2022 23:51:05 -0500
Subject: [PATCH] Update linux kernel workaround so build doesn't require a
 third ELF package. See
 http://lkml.iu.edu/hypermail/linux/kernel/2110.3/00278.html

Linux kernel commit 03f16cd020eb switched HAVE_STACK_VALIDATION
to HAVE_OBJTOOL. Updated sed to remove "selects" for both. (You can still
switch it on in menuconfig if you like. It is not mandatory for any other
architecture, and works fine without it here too.)
---
 scripts/mkroot.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/mkroot.sh b/scripts/mkroot.sh
index e52f74ba..8241d8ce 100755
--- a/scripts/mkroot.sh
+++ b/scripts/mkroot.sh
@@ -252,8 +252,9 @@ else
   announce "linux-$KARCH"
   pushd "$LINUX" && make distclean && popd &&
   cp -sfR "$LINUX" "$MYBUILD/linux" && pushd "$MYBUILD/linux" &&
-  sed -is '/select HAVE_STACK_VALIDATION/d' arch/x86/Kconfig && # Fix x86-64
-  sed -is 's/depends on !SMP/& || !MMU/' mm/Kconfig &&          # Fix sh2eb
+  # Fix x86-64 and sh2eb
+  sed -Eis '/select HAVE_(STACK_VALIDATION|OBJTOOL)/d' arch/x86/Kconfig &&
+  sed -is 's/depends on !SMP/& || !MMU/' mm/Kconfig &&
 
   # Write miniconfig
   { echo "# make ARCH=$KARCH allnoconfig KCONFIG_ALLCONFIG=$TARGET.miniconf"
-- 
2.39.2