From d09e3a9655559495e9aeff194e3ea44a2acdb315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6ppner?= <jonas.hoeppner@garz-fricke.com>
Date: Mon, 13 May 2024 08:28:07 +0000
Subject: [PATCH] CI: generate_firmware: Add releasename as name to json file
To use the generated json file in the json-fwr tooling, it helps to fill
the name.
---
scripts/generate_firmware_package.py | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/scripts/generate_firmware_package.py b/scripts/generate_firmware_package.py
index 737b721b..23a2c871 100755
--- a/scripts/generate_firmware_package.py
+++ b/scripts/generate_firmware_package.py
@@ -161,7 +161,7 @@ def generate_firmware_package(
]
sbom_packages.append(
- generate_entry(name="", _type="UBOOT", files=sbom_uboot_files)
+ generate_entry(name=release_name, _type="UBOOT", files=sbom_uboot_files)
)
else:
@@ -178,10 +178,19 @@ def generate_firmware_package(
)
)
- sbom_packages.append(generate_entry(name="", _type="YOCTO", files=sbom_files))
+ sbom_packages.append(
+ generate_entry(
+ name=f"{machine_name_long} {release_name}",
+ _type="YOCTO",
+ files=sbom_files,
+ )
+ )
sbom = generate_entry(
- name="", description="", _type="YOCTO", packages=sbom_packages
+ name=f"Release {machine_name_long} {release_name}",
+ description=f"Base package for Yocto release {machine_name_long} {release_name}",
+ _type="YOCTO",
+ packages=sbom_packages,
)
if filepath:
--
GitLab