projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build,json: store arch_packages in profiles.json
[openwrt/openwrt.git]
/
scripts
/
json_overview_image_info.py
diff --git
a/scripts/json_overview_image_info.py
b/scripts/json_overview_image_info.py
index 59d69df314e9e2820cbf4b28aea1959a93577fa3..20b14f236b3918e825d31b9f6b75e98b1bf379b5 100755
(executable)
--- 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",
[
"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,
],
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=(",", ":")))
if output:
output_path.write_text(json.dumps(output, sort_keys=True, separators=(",", ":")))