From f09b9319c666e343763c7618878a503ad7eb7531 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Tue, 30 Jun 2020 16:00:25 -1000 Subject: [PATCH] build,json: store arch_packages in profiles.json The `arch_packages` contains the supported package architecture. Previously it was necessary to parse the `Packages` index for the line `Architecture:`, requiring both an additional parser and file download. Signed-off-by: Paul Spooren --- scripts/json_overview_image_info.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/json_overview_image_info.py b/scripts/json_overview_image_info.py index 59d69df314..20b14f236b 100755 --- a/scripts/json_overview_image_info.py +++ b/scripts/json_overview_image_info.py @@ -33,19 +33,22 @@ for json_file in work_dir.glob("*.json"): ) -output["default_packages"] = run( +default_packages, output["arch_packages"] = run( [ "make", "--no-print-directory", "-C", f"target/linux/{output['target'].split('/')[0]}", "val.DEFAULT_PACKAGES", + "val.ARCH_PACKAGES", ], capture_output=True, check=True, env=environ.copy().update({"TOPDIR": Path().cwd()}), text=True, -).stdout.split() +).stdout.splitlines() + +output["default_packages"] = default_packages.split() if output: output_path.write_text(json.dumps(output, sort_keys=True, separators=(",", ":"))) -- 2.30.2