diff options
| author | Paul Spooren <mail@aparcar.org> | 2021-03-25 22:53:28 -1000 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2021-03-25 23:15:42 -1000 |
| commit | 22149da1f4f65985439b3e92da9a5226ad219f3b (patch) | |
| tree | 30157cea81d5d901062a5de3a48b25cc0983e96b /scripts | |
| parent | aacf3786083fbf3e96e732f14c3b72077d543ef0 (diff) | |
| download | upstream-22149da1f4f65985439b3e92da9a5226ad219f3b.tar.gz upstream-22149da1f4f65985439b3e92da9a5226ad219f3b.tar.bz2 upstream-22149da1f4f65985439b3e92da9a5226ad219f3b.zip | |
build,json: backport default_packages fixes
Remove duplicate packages by running in `target/linux/` rather than
`target/linux/<target>/<subtarget>` 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 <mail@aparcar.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/json_overview_image_info.py | 6 |
1 files 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") |