mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-17 12:43:56 +02:00
7880a64848
This became a bit of a tragedy, caused by a corner cases which wasn't
put into account during testing. DEFAULT_PACKAGES are defined in
target/linux/<target>/Makefile but also in
target/linux/<target>/<subtarget>/target.mk.
The latter was no longer imported when using DUMP=1, however not using
DUMP=1 while running the Makefile in target/linux/<target>/ caused duplicate
packages in the list.
As a solution, which should have been used from day 0, `make` runs in
target/linux/ without DUMP=1, resulting in no duplicate packages and all
inclusions from include/target.mk, linux/target/<target>/{Makefile,
<subtarget>/target.mk}
While at it, sort the list of default packages.
Signed-off-by: Paul Spooren <mail@aparcar.org>
57 lines
1.5 KiB
Python
Executable File
57 lines
1.5 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:
|
|
default_packages, output["arch_packages"] = run(
|
|
[
|
|
"make",
|
|
"--no-print-directory",
|
|
"-C",
|
|
"target/linux/",
|
|
"val.DEFAULT_PACKAGES",
|
|
"val.ARCH_PACKAGES",
|
|
],
|
|
stdout=PIPE,
|
|
stderr=PIPE,
|
|
check=True,
|
|
env=environ.copy().update({"TOPDIR": Path().cwd()}),
|
|
universal_newlines=True,
|
|
).stdout.splitlines()
|
|
|
|
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")
|