phase1: add JSON merge step

The refactored JSON info files require a final merge step which sums up
all created JSON info files of a target into a single `profiles.json`
files.

This patch adds the extra step to run `make json_overview_image_info`
just before calculating the checksums so the `profiles.json` files is
signed as well.

Signed-off-by: Paul Spooren <mail@aparcar.org>
[allow the step to fail to satisfy 18.06 builders]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/phase1/master.cfg b/phase1/master.cfg
index d23046659859e869c5e997f42c802fd315b65428..3ba7a1606e89b095b10555e703ea96e93295deec 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -1047,6 +1047,14 @@ for target in targets:
                haltOnFailure = True
        ))
 
+       factory.addStep(ShellCommand(
+               name = "json_overview_image_info",
+               description = "Generate profiles.json in target folder",
+               command = "make -j1 json_overview_image_info V=s || true",
+               env = MakeEnv(),
+               haltOnFailure = True
+       ))
+
        factory.addStep(ShellCommand(
                name = "checksums",
                description = "Calculating checksums",