1
0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-06-17 12:43:56 +02:00

build,json: fix duplicates in default_packages

Calling without the DUMP=1 argument causes the target specific Makefile
to be "included" again which adds the target specific packages twice,
once on the actual run and once included from `include/target.mk`.

This led to duplicate package entries, causing confusion in downstream
projects using the generated JSON files.

While at it, apply `black` style to Python script.

Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Paul Spooren 2021-03-20 23:23:34 -10:00
parent 2ba0ab1930
commit 7f4c2b1a4f

View File

@ -38,9 +38,10 @@ if output:
"make", "make",
"--no-print-directory", "--no-print-directory",
"-C", "-C",
"target/linux/{}".format(output['target'].split('/')[0]), "target/linux/{}".format(output["target"].split("/")[0]),
"val.DEFAULT_PACKAGES", "val.DEFAULT_PACKAGES",
"val.ARCH_PACKAGES", "val.ARCH_PACKAGES",
"DUMP=1",
], ],
stdout=PIPE, stdout=PIPE,
stderr=PIPE, stderr=PIPE,