aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Spooren <mail@aparcar.org>2021-03-20 23:23:34 -1000
committerPaul Spooren <mail@aparcar.org>2021-03-23 12:47:18 -1000
commitfdc0342704b692c46ccb65c6372a853ff89094c4 (patch)
tree3786fa736753fb8ecf9efb50d3ab5672d71d17f3
parent5a11ca3cf33c421949985a7ff176dac17cf07bd8 (diff)
downloadupstream-fdc0342704b692c46ccb65c6372a853ff89094c4.tar.gz
upstream-fdc0342704b692c46ccb65c6372a853ff89094c4.tar.bz2
upstream-fdc0342704b692c46ccb65c6372a853ff89094c4.zip
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> (cherry picked from commit 7f4c2b1a4f9216218dced64794318f2197565c85)
-rwxr-xr-xscripts/json_overview_image_info.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/json_overview_image_info.py b/scripts/json_overview_image_info.py
index ca6fbbc962..23d8dcb857 100755
--- a/scripts/json_overview_image_info.py
+++ b/scripts/json_overview_image_info.py
@@ -38,9 +38,10 @@ if output:
"make",
"--no-print-directory",
"-C",
- "target/linux/{}".format(output['target'].split('/')[0]),
+ "target/linux/{}".format(output["target"].split("/")[0]),
"val.DEFAULT_PACKAGES",
"val.ARCH_PACKAGES",
+ "DUMP=1",
],
stdout=PIPE,
stderr=PIPE,