From: Paul Spooren Date: Sun, 13 Oct 2019 21:00:39 +0000 (-1000) Subject: phase1: use buildinfo instead of prepare X-Git-Tag: v1~70 X-Git-Url: http://git.openwrt.org/?p=buildbot.git;a=commitdiff_plain;h=1bf7b4707ef9bc9517d69fee277ecd5f916df390 phase1: use buildinfo instead of prepare 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 --- diff --git a/phase1/master.cfg b/phase1/master.cfg index ee26fe4..6675f25 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 ))