[OpenWrt-Devel] buildbot, phase1: use buildinfo instead of prepare
diff mbox series

Message ID 20191013210039.14448-1-mail@aparcar.org
State Accepted
Headers show
Series
  • [OpenWrt-Devel] buildbot, phase1: use buildinfo instead of prepare
Related show

Commit Message

Paul Spooren Oct. 13, 2019, 9 p.m. UTC
Prepare target is used to compile tools and toolchain, however buildbot
only uses it to create the buildinfo files. This[0] PR splits prepare
and buildinfo allowing the buildbots to run the buildinfo creation only.

This should also fix the current issue with missing json info files:
prepare runs `target/compile` which removes all existing json info files
via `Device/Build`. Only `target/install` creates them via
`Device/Build/image`. However currently the buildbots run
`target/install` before (the second) `target/compile`.

[0]: https://github.com/openwrt/openwrt/pull/2492

Signed-off-by: Paul Spooren <mail@aparcar.org>
---
 phase1/master.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch
diff mbox series

diff --git a/phase1/master.cfg b/phase1/master.cfg
index f0151f6..0aaa079 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -920,7 +920,7 @@  for target in targets:
 	factory.addStep(ShellCommand(
 		name = "buildinfo",
 		description = "Generating config.buildinfo, version.buildinfo and feeds.buildinfo",
-		command=["make", "-j1", "prepare", "V=s"],
+		command=["make", "-j1", "buildinfo", "V=s"],
 		env = MakeEnv(),
 		haltOnFailure = True
 	))