phase1: use buildinfo instead of prepare
authorPaul Spooren <mail@aparcar.org>
Sun, 13 Oct 2019 21:00:39 +0000 (11:00 -1000)
committerJo-Philipp Wich <jo@mein.io>
Fri, 18 Oct 2019 06:41:09 +0000 (08:41 +0200)
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

index ee26fe4c63f46f733576f5ffd823cadb78c6c546..6675f2570a7e64c405bf3cf6a6b452b6ef4b8c5c 100644 (file)
@@ -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
        ))