{"body":"diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass\nindex ac9f0fb22c..039d5d01e7 100644\n--- a/meta/classes/cve-check.bbclass\n+++ b/meta/classes/cve-check.bbclass\n@@ -75,13 +75,11 @@ CVE_CHECK_LAYER_INCLUDELIST ??= \"\"\n # set to \"alphabetical\" for version using single alphabetical character as increment release\n CVE_VERSION_SUFFIX ??= \"\"\n \n-def generate_json_report(out_path, link_path):\n-    if os.path.exists(d.getVar(\"CVE_CHECK_SUMMARY_INDEX_PATH\")):\n+def generate_json_report(out_path, link_path, index_file):\n+    if os.path.exists(index_file):\n         import json\n         from oe.cve_check import cve_check_merge_jsons\n \n-        bb.note(\"Generating JSON CVE summary\")\n-        index_file = d.getVar(\"CVE_CHECK_SUMMARY_INDEX_PATH\")\n         summary = {\"version\":\"1\", \"package\": []}\n         with open(index_file) as f:\n             filename = f.readline()\n@@ -98,6 +96,9 @@ def generate_json_report(out_path, link_path):\n             if os.path.exists(os.path.realpath(link_path)):\n                 os.remove(link_path)\n             os.symlink(os.path.basename(out_path), link_path)\n+        bb.plain(\"CVE report summary created at: %s\" % link_name)\n+    else:\n+        bb.warn(\"Failed to create CVE JSON summary report: %s\" % link_path)\n \n python cve_save_summary_handler () {\n     import shutil\n@@ -123,10 +124,11 @@ python cve_save_summary_handler () {\n                     os.remove(cvefile_link)\n                 os.symlink(os.path.basename(cve_summary_file), cvefile_link)\n \n-        json_summary_link_name = os.path.join(cvelogpath, d.getVar(\"CVE_CHECK_SUMMARY_FILE_NAME_JSON\"))\n-        json_summary_name = os.path.join(cvelogpath, \"%s-%s.json\" % (cve_summary_name, timestamp))\n-        generate_json_report(json_summary_name, json_summary_link_name)\n-        bb.plain(\"CVE report summary created at: %s\" % json_summary_link_name)\n+        if d.getVar(\"CVE_CHECK_FORMAT_JSON\") == \"1\":\n+            json_summary_link_name = os.path.join(cvelogpath, d.getVar(\"CVE_CHECK_SUMMARY_FILE_NAME_JSON\"))\n+            json_summary_name = os.path.join(cvelogpath, \"%s-%s.json\" % (cve_summary_name, timestamp))\n+            index_file = d.getVar(\"CVE_CHECK_SUMMARY_INDEX_PATH\")\n+            generate_json_report(json_summary_name, json_summary_link_name, index_file)\n }\n \n addhandler cve_save_summary_handler\n@@ -202,11 +204,12 @@ python cve_check_write_rootfs_manifest () {\n                 os.symlink(os.path.basename(manifest_name), manifest_link)\n             bb.plain(\"Image CVE report stored in: %s\" % manifest_name)\n \n-        link_path = os.path.join(deploy_dir, \"%s.json\" % link_name)\n-        manifest_path = d.getVar(\"CVE_CHECK_MANIFEST_JSON\")\n-        bb.note(\"Generating JSON CVE manifest\")\n-        generate_json_report(json_summary_name, json_summary_link_name)\n-        bb.plain(\"Image CVE JSON report stored in: %s\" % link_path)\n+        if d.getVar(\"CVE_CHECK_FORMAT_JSON\") == \"1\":\n+            link_path = os.path.join(deploy_dir, \"%s.json\" % link_name)\n+            manifest_path = d.getVar(\"CVE_CHECK_MANIFEST_JSON\")\n+            bb.note(\"Generating JSON CVE manifest\")\n+            index_file = d.getVar(\"CVE_CHECK_SUMMARY_INDEX_PATH\")\n+            generate_json_report(manifest_path, link_path, index_file)\n }\n \n ROOTFS_POSTPROCESS_COMMAND_prepend = \"${@'cve_check_write_rootfs_manifest; ' if d.getVar('CVE_CHECK_CREATE_MANIFEST') == '1' else ''}\"\n-- \n2.35.1","name":"","extension":"diff","url":"https://www.irccloud.com/pastebin/rH7PsQ4q","modified":1652707209,"id":"rH7PsQ4q","size":3409,"lines":66,"own_paste":false,"theme":"","date":1652707209}