mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
1bf2b3fe90
Fix 7f4c2b1 "build,json: fix duplicates in default_packages" which
removed duplicate default packages but also removed the package
architecture from the profiles.json.
If DUMP=1 is set, the `ARCH_PACKAGES` is no longer exported and
therefore empty. Fix this by running make twice, once with DUMP=1 and
once without.
Signed-off-by: Paul Spooren <mail@aparcar.org>
68 lines
1.8 KiB
Python
Executable File
68 lines
1.8 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
from os import getenv, environ
|
|
from pathlib import Path
|
|
from subprocess import run, PIPE
|
|
from sys import argv
|
|
import json
|
|
|
|
if len(argv) != 2:
|
|
print("JSON info files script requires ouput file as argument")
|
|
exit(1)
|
|
|
|
output_path = Path(argv[1])
|
|
|
|
assert getenv("WORK_DIR"), "$WORK_DIR required"
|
|
|
|
work_dir = Path(getenv("WORK_DIR"))
|
|
|
|
output = {}
|
|
|
|
for json_file in work_dir.glob("*.json"):
|
|
image_info = json.loads(json_file.read_text())
|
|
if not output:
|
|
output.update(image_info)
|
|
else:
|
|
# get first (and only) profile in json file
|
|
device_id = next(iter(image_info["profiles"].keys()))
|
|
if device_id not in output["profiles"]:
|
|
output["profiles"].update(image_info["profiles"])
|
|
else:
|
|
output["profiles"][device_id]["images"].append(
|
|
image_info["profiles"][device_id]["images"][0]
|
|
)
|
|
|
|
if output:
|
|
output["default_packages"] = run(
|
|
[
|
|
"make",
|
|
"--no-print-directory",
|
|
"-C",
|
|
"target/linux/{}".format(output["target"].split("/")[0]),
|
|
"val.DEFAULT_PACKAGES",
|
|
"DUMP=1",
|
|
],
|
|
stdout=PIPE,
|
|
stderr=PIPE,
|
|
check=True,
|
|
env=environ.copy().update({"TOPDIR": Path().cwd()}),
|
|
universal_newlines=True,
|
|
).stdout.split()
|
|
|
|
output["arch_packages"] = run(
|
|
[
|
|
"make",
|
|
"--no-print-directory",
|
|
"val.ARCH_PACKAGES",
|
|
],
|
|
stdout=PIPE,
|
|
stderr=PIPE,
|
|
check=True,
|
|
env=environ.copy().update({"TOPDIR": Path().cwd()}),
|
|
universal_newlines=True,
|
|
).stdout.strip()
|
|
|
|
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")
|