From 3b90857a43430eec7ab3d7c393156d949708fb79 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 10 Jun 2022 23:49:25 -0500 Subject: [PATCH] Turn the "run make oldconfig" message into a warning instead of an error. (It's interfering with the Android build's header snapshot thing. When we rewrite kconfig from scratch we can have it call oldconfig itself, until then just mention that we detected the need. It works without it often enough, and the build breaks shouldn't be subtle...) --- scripts/make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/make.sh b/scripts/make.sh index e0751a06..a25eed2b 100755 --- a/scripts/make.sh +++ b/scripts/make.sh @@ -110,7 +110,7 @@ A="$($SED -n '/^config .*$/h;s/default \(.\)/\1/;T;H;g;s/config \([^\n]*\)[^yn]* B="$(egrep "^CONFIG_($(echo "$A" | sed 's/=[yn]//' | xargs | tr ' ' '|'))=" "$KCONFIG_CONFIG" | $SED 's/^CONFIG_//' | sort)" A="$(echo "$A" | grep -v =n)" [ "$A" != "$B" ] && - { echo -e "\nConfig.probed changed, run 'make oldconfig'" >&2; exit 1;} + { echo -e "\nWarning: Config.probed changed, run 'make oldconfig'" >&2; } unset A B # Create a list of all the commands toybox can provide. -- 2.39.2