From a6d5b5d1c1c6ea922afcfff1efac7fb55c9664c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
Date: Tue, 13 Aug 2019 15:20:15 +0200
Subject: [PATCH] circleci: provide prereq output in the build log
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit 200f2666fb1c ("sdk: fix GCC and Python dangling symlinks") in
master tree has forced prereq build step, which is now failing on the CI
as the Docker CI images are missing Python3 support, so now every build
fails with the following error:

 make: *** [staging_dir/host/.prereq-build] Error 1

which is not helpful due to the silenced output of `make defconfig >
/dev/null`, so let's add `make prereq` build step in order to get
something usable next time.

Reported-by: Karl Palsson <karlp@etactica.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---
 .circleci/config.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2edf04292..111440797 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -94,6 +94,11 @@ jobs:
           working_directory: ~/build_dir
           command: |
              tar Jxf ~/sdk/$SDK_FILE --strip=1
+             touch .config
+             make prepare-tmpinfo scripts/config/conf
+             ./scripts/config/conf --defconfig=.config Config.in
+             make prereq
+             rm .config
              cat > feeds.conf <<EOF
              src-git base https://github.com/openwrt/openwrt.git;$BRANCH
              src-link packages $HOME/openwrt_packages