[openwrt/openwrt] build: profiles.json: add kernel version information

LEDE Commits lede-commits at lists.infradead.org
Fri Nov 29 12:45:16 PST 2024


ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/db554fd4502b2e9fb2ff669a9fbd65573f0b2007

commit db554fd4502b2e9fb2ff669a9fbd65573f0b2007
Author: Eric Fahlgren <ericfahlgren at gmail.com>
AuthorDate: Fri Nov 22 09:00:25 2024 -0800

    build: profiles.json: add kernel version information
    
    Currently downstream tools like ASU lack information about kernel
    version to find out the relevant kmod build folder on downloads server.
    
    So lets fix it by providing a new `linux_kernel` JSON array which would
    for the start provide Linux kernel version, revision and vermagic
    information.
    
      "linux_kernel": {
         "release": "1",
         "vermagic": "b57450c07d3a786158c3601fc5cee57d",
         "version": "6.6.61"
       },
    
    Fixes: openwrt/openwrt#17036
    Fixes: efahl/owut#9
    Co-developed-by: Petr Štetiar <ynezz at true.cz>
    Signed-off-by: Eric Fahlgren <ericfahlgren at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/17042
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
    (cherry picked from commit c857145e034f623e31ab2028049a547ecd94ce85)
---
 scripts/json_overview_image_info.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/scripts/json_overview_image_info.py b/scripts/json_overview_image_info.py
index 0d2cf7f1ef..96921c2743 100755
--- a/scripts/json_overview_image_info.py
+++ b/scripts/json_overview_image_info.py
@@ -47,7 +47,13 @@ for device_id, profile in output.get("profiles", {}).items():
 
 
 if output:
-    default_packages, output["arch_packages"] = run(
+    (
+        default_packages,
+        output["arch_packages"],
+        linux_version,
+        linux_release,
+        linux_vermagic,
+    ) = run(
         [
             "make",
             "--no-print-directory",
@@ -55,6 +61,9 @@ if output:
             "target/linux/",
             "val.DEFAULT_PACKAGES",
             "val.ARCH_PACKAGES",
+            "val.LINUX_VERSION",
+            "val.LINUX_RELEASE",
+            "val.LINUX_VERMAGIC",
             "V=s",
         ],
         stdout=PIPE,
@@ -64,7 +73,11 @@ if output:
     ).stdout.splitlines()
 
     output["default_packages"] = sorted(default_packages.split())
-
+    output["linux_kernel"] = {
+        "version": linux_version,
+        "release": linux_release,
+        "vermagic": linux_vermagic,
+    }
     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")




More information about the lede-commits mailing list