scripts/diffconfig.sh: ensure config/conf is built
authorEneas U de Queiroz <cotequeiroz@gmail.com>
Mon, 21 Feb 2022 17:44:43 +0000 (14:44 -0300)
committerPetr Štetiar <ynezz@true.cz>
Sat, 26 Feb 2022 12:36:30 +0000 (13:36 +0100)
diffconfig.sh runs ./scripts/config/conf, but it does not get built
with 'make {menu,x,n}config.  Call 'make ./scripts/config/conf' to
ensure it's been built before running it, aborting in case of failure.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>[removed Fixes: due revert]
scripts/diffconfig.sh

index 5f9fec56000f85fb985115d3cb2f608c1fa62f7d..7ffe9dd01ae27eb9cde7dc43879a88a7b2df359f 100755 (executable)
@@ -1,4 +1,5 @@
 #!/bin/sh
+make ./scripts/config/conf >/dev/null || { make ./scripts/config/conf; exit 1; }
 grep \^CONFIG_TARGET_ .config | head -n3 > tmp/.diffconfig.head
 grep \^CONFIG_TARGET_DEVICE_ .config >> tmp/.diffconfig.head
 grep '^CONFIG_ALL=y' .config >> tmp/.diffconfig.head