domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build,json: backport default_packages fixes

Browse Source 
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>
This commit is contained in:
Paul Spooren
2021-03-25 22:53:28 -10:00
parent aacf378608
commit 22149da1f4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/json_overview_image_info.py
View File

@@ -38,10 +38,9 @@ if output:
"make", "make",
"--no-print-directory", "--no-print-directory",
"-C", "-C",
"target/linux/{}".format(output["target"].split("/")[0]), "target/linux/",
"val.DEFAULT_PACKAGES", "val.DEFAULT_PACKAGES",
"val.ARCH_PACKAGES", "val.ARCH_PACKAGES",
"DUMP=1",
], ],
stdout=PIPE, stdout=PIPE,
stderr=PIPE, stderr=PIPE,
@@ -50,7 +49,8 @@ if output:
universal_newlines=True, universal_newlines=True,
).stdout.splitlines() ).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=(",", ":"))) output_path.write_text(json.dumps(output, sort_keys=True, separators=(",", ":")))
else: else:
print("JSON info file script could not find any JSON files for target") print("JSON info file script could not find any JSON files for target")