ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-22 10:01:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

build,json: 3rd fixup of default_packages

Browse Source 
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>
This commit is contained in:
Paul Spooren 2021-03-25 10:25:54 -10:00
parent b36068d35d
commit 7880a64848
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/json_overview_image_info.py
View File

@ -33,28 +33,13 @@ for json_file in work_dir.glob("*.json"):
) )
if output: if output:
output["default_packages"] = run( default_packages, output["arch_packages"] = run(
[ [
"make", "make",
"--no-print-directory", "--no-print-directory",
"-C", "-C",
"target/linux/{}".format(output["target"].split("/")[0]), "target/linux/",
"val.DEFAULT_PACKAGES", "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",
"-C",
"target/linux/{}".format(output["target"].split("/")[0]),
"val.ARCH_PACKAGES", "val.ARCH_PACKAGES",
], ],
stdout=PIPE, stdout=PIPE,
@ -62,7 +47,9 @@ if output:
check=True, check=True,
env=environ.copy().update({"TOPDIR": Path().cwd()}), env=environ.copy().update({"TOPDIR": Path().cwd()}),
universal_newlines=True, universal_newlines=True,
).stdout.strip() ).stdout.splitlines()
output["default_packages"] = sorted(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: