[openwrt/openwrt] build,json: fix duplicates in default_packages

LEDE Commits lede-commits at lists.infradead.org
Tue Mar 23 22:47:37 GMT 2021


aparcar pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/fdc0342704b692c46ccb65c6372a853ff89094c4

commit fdc0342704b692c46ccb65c6372a853ff89094c4
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Sat Mar 20 23:23:34 2021 -1000

    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 at aparcar.org>
    (cherry picked from commit 7f4c2b1a4f9216218dced64794318f2197565c85)
---
 scripts/json_overview_image_info.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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,



More information about the lede-commits mailing list