From 22149da1f4f65985439b3e92da9a5226ad219f3b Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Thu, 25 Mar 2021 22:53:28 -1000 Subject: [PATCH] build,json: backport default_packages fixes Remove duplicate packages by running in `target/linux/` rather than `target/linux//` and sort packages alphabetically. Squash commit of: 7880a64848 build,json: 3rd fixup of default_packages b36068d35d build,json: fixup fixup of arch_packages 1bf2b3fe90 build,json: fixup missing arch_packages Signed-off-by: Paul Spooren --- scripts/json_overview_image_info.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/json_overview_image_info.py b/scripts/json_overview_image_info.py index 23d8dcb857..8dbd24af2d 100755 --- a/scripts/json_overview_image_info.py +++ b/scripts/json_overview_image_info.py @@ -38,10 +38,9 @@ if output: "make", "--no-print-directory", "-C", - "target/linux/{}".format(output["target"].split("/")[0]), + "target/linux/", "val.DEFAULT_PACKAGES", "val.ARCH_PACKAGES", - "DUMP=1", ], stdout=PIPE, stderr=PIPE, @@ -50,7 +49,8 @@ if output: universal_newlines=True, ).stdout.splitlines() - output["default_packages"] = default_packages.split() + output["default_packages"] = sorted(default_packages.split()) + output_path.write_text(json.dumps(output, sort_keys=True, separators=(",", ":"))) else: print("JSON info file script could not find any JSON files for target") -- 2.30.2