[OpenWrt-Devel] [PATCH] phase1: Add JSON merging step

[Paul Spooren]

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 at aparcar.org>
---
 phase1/master.cfg | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 792f9b3..6ff827d 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -925,6 +925,14 @@ for target in targets:
 		haltOnFailure = True
 	))
 
+	factory.addStep(ShellCommand(
+		name = "json_overview_image_info",
+		description = "Merging created JSON info files into profiles.json",
+		command=["make", "-j1", "json_overview_image_info", "V=s"],
+		env = MakeEnv(),
+		haltOnFailure = True
+	))
+
 	factory.addStep(ShellCommand(
 		name = "checksums",
 		description = "Calculating checksums",
-- 
2.25.1


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel