From: Petr Štetiar <ynezz@true.cz>
Date: Thu, 24 Feb 2022 10:41:27 +0000 (+0100)
Subject: Revert "scripts/diffconfig.sh: ensure config/conf is built"
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d6119e2f38c8bbadd2a469da8d4db699aa94bb04;p=openwrt%2Fstaging%2Fxback.git

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

This reverts commit c0849c1d9c17ba96a37b67363b5551c065e9f50d as it seems
to introduce regression in config.buildinfo files produced at least by
buildbots:

 $ curl -s https://downloads.openwrt.org/snapshots/targets/ath79/generic/config.buildinfo | head -2
 make[3]: Entering directory '/builder/shared-workdir/build'
 make[3]: Leaving directory '/builder/shared-workdir/build'

References: https://github.com/openwrt/openwrt/issues/9297#issuecomment-1049719381
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/scripts/diffconfig.sh b/scripts/diffconfig.sh
index ba5d8e8712..5f9fec5600 100755
--- a/scripts/diffconfig.sh
+++ b/scripts/diffconfig.sh
@@ -8,7 +8,6 @@ grep '^CONFIG_DEVEL=y' .config >> tmp/.diffconfig.head
 grep '^CONFIG_TOOLCHAINOPTS=y' .config >> tmp/.diffconfig.head
 grep '^CONFIG_BUSYBOX_CUSTOM=y' .config >> tmp/.diffconfig.head
 grep '^CONFIG_TARGET_PER_DEVICE_ROOTFS=y' .config >> tmp/.diffconfig.head
-make -s ./scripts/config/conf
 ./scripts/config/conf --defconfig=tmp/.diffconfig.head -w tmp/.diffconfig.stage1 Config.in >/dev/null
 ./scripts/kconfig.pl '>+' tmp/.diffconfig.stage1 .config >> tmp/.diffconfig.head
 ./scripts/config/conf --defconfig=tmp/.diffconfig.head -w tmp/.diffconfig.stage2 Config.in >/dev/null