hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-11-03 14:34:27 -05:00
Code Issues Projects Releases Wiki Activity

build,json: fix build failure in case no data is found

Browse Source 
Only collect arch_packages if actually generating any output.

Fixes: commit f09b9319 ("build,json: store arch_packages in profiles.json"(
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Daniel Golle 2020-07-03 21:57:52 +01:00
parent a175bc8f36
commit 3b0f698760
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/json_overview_image_info.py
View File

@ -32,25 +32,23 @@ for json_file in work_dir.glob("*.json"):
image_info["profiles"][device_id]["images"][0] image_info["profiles"][device_id]["images"][0]
) )
default_packages, output["arch_packages"] = run(
[
"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,
).stdout.splitlines()
output["default_packages"] = default_packages.split()
if output: if output:
default_packages, output["arch_packages"] = run(
[
"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,
).stdout.splitlines()
output["default_packages"] = 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")