From: Eneas U de Queiroz <cotequeiroz@gmail.com>
Date: Mon, 21 Feb 2022 17:44:43 +0000 (-0300)
Subject: scripts/diffconfig.sh: ensure config/conf is built
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=65c28d7a6750b5f73328736414902e58339b0784;p=openwrt%2Fstaging%2Fnoltari.git

scripts/diffconfig.sh: ensure config/conf is built

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]
---

diff --git a/scripts/diffconfig.sh b/scripts/diffconfig.sh
index 5f9fec5600..7ffe9dd01a 100755
--- a/scripts/diffconfig.sh
+++ b/scripts/diffconfig.sh
@@ -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