diff options
author | Moritz Warning <moritzwarning@web.de> | 2021-02-22 00:18:10 +0100 |
---|---|---|
committer | Paul Spooren <mail@aparcar.org> | 2021-06-16 21:28:53 -1000 |
commit | a463b96241fbc2d142982387eaed9989e201ac7a (patch) | |
tree | 04e6487ecbe188515673f7bc756badf0a6430d89 | |
parent | 3d026d24257a0e2f3170538d8a54d520315699a1 (diff) | |
download | upstream-a463b96241fbc2d142982387eaed9989e201ac7a.tar.gz upstream-a463b96241fbc2d142982387eaed9989e201ac7a.tar.bz2 upstream-a463b96241fbc2d142982387eaed9989e201ac7a.zip |
build: preserve profiles.json between builds
Keep other profiles.json content if the data belongs to the current
build version.
Also useful for the ImageBuilder, which builds for a single model each
time. Without this commit the profiles.json would only contain the
latest build profile information.
Signed-off-by: Moritz Warning <moritzwarning@web.de>
[improve commit message]
Signed-off-by: Paul Spooren <mail@aparcar.org>
-rwxr-xr-x | scripts/json_overview_image_info.py | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/scripts/json_overview_image_info.py b/scripts/json_overview_image_info.py index 8dbd24af2d..45c05012b1 100755 --- a/scripts/json_overview_image_info.py +++ b/scripts/json_overview_image_info.py @@ -18,19 +18,33 @@ 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["profiles"].items(): + profile["images"] = list({e["name"]: e for e in profile["images"]}.values()) + if output: default_packages, output["arch_packages"] = run( |