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_packagesb36068d35d
build,json: fixup fixup of arch_packages1bf2b3fe90
build,json: fixup missing arch_packages Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
parent
aacf378608
commit
22149da1f4
|
@ -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")
|
||||
|
|
Loading…
Reference in New Issue