@@ -79,7 +79,7 @@ CVE_CHECK_LAYER_INCLUDELIST ??= ""
# set to "alphabetical" for version using single alphabetical character as increment release
CVE_VERSION_SUFFIX ??= ""
-def generate_json_report(out_path, link_path):
+def generate_json_report(d, out_path, link_path):
if os.path.exists(d.getVar("CVE_CHECK_SUMMARY_INDEX_PATH")):
import json
from oe.cve_check import cve_check_merge_jsons
@@ -129,7 +129,7 @@ python cve_save_summary_handler () {
json_summary_link_name = os.path.join(cvelogpath, d.getVar("CVE_CHECK_SUMMARY_FILE_NAME_JSON"))
json_summary_name = os.path.join(cvelogpath, "%s-%s.json" % (cve_summary_name, timestamp))
- generate_json_report(json_summary_name, json_summary_link_name)
+ generate_json_report(d, json_summary_name, json_summary_link_name)
bb.plain("CVE report summary created at: %s" % json_summary_link_name)
}
@@ -210,7 +210,7 @@ python cve_check_write_rootfs_manifest () {
link_path = os.path.join(deploy_dir, "%s.json" % link_name)
manifest_path = d.getVar("CVE_CHECK_MANIFEST_JSON")
bb.note("Generating JSON CVE manifest")
- generate_json_report(json_summary_name, json_summary_link_name)
+ generate_json_report(d, manifest_path, link_path)
bb.plain("Image CVE JSON report stored in: %s" % link_path)
}