From: Paul Spooren <mail@aparcar.org>
Date: Sun, 21 Mar 2021 09:23:34 +0000 (-1000)
Subject: build,json: fix duplicates in default_packages
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7f4c2b1a4f9216218dced64794318f2197565c85;p=openwrt%2Fstaging%2F981213.git

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>
---

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,