[openwrt/openwrt] build,json: backport default_packages fixes

[LEDE Commits]

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

commit 22149da1f4f65985439b3e92da9a5226ad219f3b
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Thu Mar 25 22:53:28 2021 -1000

    build,json: backport default_packages fixes
    
    Remove duplicate packages by running in `target/linux/` rather than
    `target/linux/<target>/<subtarget>` and sort packages alphabetically.
    
    Squash commit of:
    7880a64848 build,json: 3rd fixup of default_packages
    b36068d35d build,json: fixup fixup of arch_packages
    1bf2b3fe90 build,json: fixup missing arch_packages
    
    Signed-off-by: Paul Spooren <mail at aparcar.org>
---
 scripts/json_overview_image_info.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/json_overview_image_info.py b/scripts/json_overview_image_info.py
index 23d8dcb857..8dbd24af2d 100755
--- a/scripts/json_overview_image_info.py
+++ b/scripts/json_overview_image_info.py
@@ -38,10 +38,9 @@ if output:
             "make",
             "--no-print-directory",
             "-C",
-            "target/linux/{}".format(output["target"].split("/")[0]),
+            "target/linux/",
             "val.DEFAULT_PACKAGES",
             "val.ARCH_PACKAGES",
-            "DUMP=1",
         ],
         stdout=PIPE,
         stderr=PIPE,
@@ -50,7 +49,8 @@ if output:
         universal_newlines=True,
     ).stdout.splitlines()
 
-    output["default_packages"] = default_packages.split()
+    output["default_packages"] = sorted(default_packages.split())
+
     output_path.write_text(json.dumps(output, sort_keys=True, separators=(",", ":")))
 else:
     print("JSON info file script could not find any JSON files for target")