From 0866cdd2a087b8e5858beafef5592ebb9f563e76 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Tue, 1 Nov 2022 18:33:36 -0500 Subject: [PATCH] More specific sed to hit just the one config symbol. --- scripts/mkroot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mkroot.sh b/scripts/mkroot.sh index 0f9e5f93..ea948026 100755 --- a/scripts/mkroot.sh +++ b/scripts/mkroot.sh @@ -262,7 +262,7 @@ else pushd "$LINUX" && make distclean && popd && cp -sfR "$LINUX" "$TEMP/linux" && pushd "$TEMP/linux" && # Fix x86-64, sh2eb, and building with cc pointing to llvm or gcc - sed -Eis '/select HAVE_(STACK_VALIDATION|OBJTOOL)/d' arch/x86/Kconfig && + sed -Eis '/select HAVE_(STACK_VALIDATION|OBJTOOL)[^_]/d' arch/x86/Kconfig && sed -is 's/depends on !SMP/& || !MMU/' mm/Kconfig && sed -i 's@=\(.*[ )]\)gcc$@:=\1$(shell $(CROSS_COMPILE)cc --version >/dev/null 2>\&1 \&\& echo cc || echo gcc)@' Makefile && -- 2.39.2