From: akuster <akuster808@gmail.com>
Date: Mon, 8 Feb 2021 05:51:29 +0000 (+0000)
Subject: cve-check.bbclass: add layer to cve log
X-Git-Tag: 2020-04.7-dunfell~136
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4281c88dd36d93fda5ca5e90722c98c061da25c6;p=openembedded-core.git

cve-check.bbclass: add layer to cve log

Lets include whcih layer a package belongs to and
add it to the cve logs

Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 00d965bb42dc427749a4c3985af56ceffff80457)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index edb704b187..8086cf05e9 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -335,6 +335,9 @@ def cve_write_data(d, patched, unpatched, whitelisted, cve_data):
     """
 
     cve_file = d.getVar("CVE_CHECK_LOG")
+    fdir_name  = d.getVar("FILE_DIRNAME")
+    layer = fdir_name.split("/")[-3]
+
     nvd_link = "https://web.nvd.nist.gov/view/vuln/detail?vulnId="
     write_string = ""
     unpatched_cves = []
@@ -344,6 +347,7 @@ def cve_write_data(d, patched, unpatched, whitelisted, cve_data):
         is_patched = cve in patched
         if is_patched and (d.getVar("CVE_CHECK_REPORT_PATCHED") != "1"):
             continue
+        write_string += "LAYER: %s\n" % layer
         write_string += "PACKAGE NAME: %s\n" % d.getVar("PN")
         write_string += "PACKAGE VERSION: %s%s\n" % (d.getVar("EXTENDPE"), d.getVar("PV"))
         write_string += "CVE: %s\n" % cve