From 2ecde598b7c3fdb9769f14ab38d5df24c26e28aa Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 23 Jan 2017 14:23:36 +0100 Subject: [PATCH] phase1: move ccache preparation after defconfig The ccache.sh helper script uses make targets to figure out staging_dir paths which might trigger interactive menuconfig in case there is no populated .config file yet, leading to command timeouts on fresh trees. Move the ccache preparation step after defconfig in order to avoid triggering menuconfig. Signed-off-by: Jo-Philipp Wich --- phase1/master.cfg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index bc21f80..695973f 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -454,13 +454,6 @@ for target in targets: command=["./scripts/feeds", "install", "-a"], env = MakeEnv())) - # ccache helper - factory.addStep(FileDownload( - mastersrc = "ccache.sh", - slavedest = "ccache.sh", - mode = 0755 - )) - # ccache prepare factory.addStep(ShellCommand( name = "prepccache", @@ -513,6 +506,13 @@ for target in targets: description = "Finding libc suffix", command = ["sed", "-ne", '/^CONFIG_LIBC=/ { s!^CONFIG_LIBC="\\(.*\\)"!\\1!; s!^musl$!!; s!.\\+!-&!p }', ".config"])) + # ccache helper + factory.addStep(FileDownload( + mastersrc = "ccache.sh", + slavedest = "ccache.sh", + mode = 0755 + )) + # install build key factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="key-build", mode=0600)) factory.addStep(FileDownload(mastersrc=home_dir+'/key-build.pub', slavedest="key-build.pub", mode=0600)) -- 2.30.2