scripts: sercomm-pid.py: use uppercase hwid in pid

[openwrt/staging/stintel.git] / scripts / json_overview_image_info.py

diff --git a/scripts/json_overview_image_info.py b/scripts/json_overview_image_info.py
index cd814a19c0bdf1ec48e504f13603f9853aa16642..89b7d4fe202c3859b2e3f12341f1252196448b56 100755 (executable)
--- a/scripts/json_overview_image_info.py
+++ b/scripts/json_overview_image_info.py
@@ -7,7 +7,7 @@ from sys import argv
 import json
 
 if len(argv) != 2:
-    print("JSON info files script requires ouput file as argument")
+    print("JSON info files script requires output file as argument")
     exit(1)
 
 output_path = Path(argv[1])
@@ -18,43 +18,42 @@ work_dir = Path(getenv("WORK_DIR"))
 
 output = {}
 
+
+def get_initial_output(image_info):
+    # preserve existing profiles.json
+    if output_path.is_file():
+        profiles = json.loads(output_path.read_text())
+        if profiles["version_code"] == image_info["version_code"]:
+            return profiles
+    return image_info
+
+
 for json_file in work_dir.glob("*.json"):
     image_info = json.loads(json_file.read_text())
+
     if not output:
-        output.update(image_info)
+        output = get_initial_output(image_info)
+
+    # get first and only profile in json file
+    device_id, profile = next(iter(image_info["profiles"].items()))
+    if device_id not in output["profiles"]:
+        output["profiles"][device_id] = profile
     else:
-        # get first (and only) profile in json file
-        device_id = next(iter(image_info["profiles"].keys()))
-        if device_id not in output["profiles"]:
-            output["profiles"].update(image_info["profiles"])
-        else:
-            output["profiles"][device_id]["images"].append(
-                image_info["profiles"][device_id]["images"][0]
-            )
+        output["profiles"][device_id]["images"].extend(profile["images"])
+
+# make image lists unique by name, keep last/latest
+for device_id, profile in output.get("profiles", {}).items():
+    profile["images"] = list({e["name"]: e for e in profile["images"]}.values())
+
 
 if output:
-    output["default_packages"] = run(
+    default_packages, output["arch_packages"] = run(
         [
             "make",
             "--no-print-directory",
             "-C",
-            "target/linux/{}".format(output["target"].split("/")[0]),
+            "target/linux/",
             "val.DEFAULT_PACKAGES",
-            "DUMP=1",
-        ],
-        stdout=PIPE,
-        stderr=PIPE,
-        check=True,
-        env=environ.copy().update({"TOPDIR": Path().cwd()}),
-        universal_newlines=True,
-    ).stdout.split()
-
-    output["arch_packages"] = run(
-        [
-            "make",
-            "--no-print-directory",
-            "-C",
-            "target/linux/{}".format(output["target"].split("/")[0]),
             "val.ARCH_PACKAGES",
         ],
         stdout=PIPE,
@@ -62,7 +61,9 @@ if output:
         check=True,
         env=environ.copy().update({"TOPDIR": Path().cwd()}),
         universal_newlines=True,
-    ).stdout.strip()
+    ).stdout.splitlines()
+
+    output["default_packages"] = sorted(default_packages.split())
 
     output_path.write_text(json.dumps(output, sort_keys=True, separators=(",", ":")))
 else: