summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Siemsen <ralph.siemsen@linaro.org>2020-06-02 14:21:13 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:31 +0100
commit9fef505804e33a32b99c8b5faeb5f69dc64dc60d (patch)
treebf2d228136af1f646815c712683dfc42fba94fb6
parent098d1a65e0192be1c7b816145fbeb41ed90ebf08 (diff)
downloadpoky-9fef505804e33a32b99c8b5faeb5f69dc64dc60d.tar.gz
cve-check: include epoch in product version output
In the generated cve.log files, include the epoch in the product version. This better matches how versions are displayed elsewhere, in particular the bb.warn("Found unpatched CVE...") that appears on the terminal when CVEs are found. (From OE-Core rev: e1c3c0b6e5b01304e2127f5058986697e82adf93) Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/cve-check.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index 556ac6e67f..514897e8b8 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -301,7 +301,7 @@ def cve_write_data(d, patched, unpatched, whitelisted, cve_data):
301 301
302 for cve in sorted(cve_data): 302 for cve in sorted(cve_data):
303 write_string += "PACKAGE NAME: %s\n" % d.getVar("PN") 303 write_string += "PACKAGE NAME: %s\n" % d.getVar("PN")
304 write_string += "PACKAGE VERSION: %s\n" % d.getVar("PV") 304 write_string += "PACKAGE VERSION: %s%s\n" % (d.getVar("EXTENDPE"), d.getVar("PV"))
305 write_string += "CVE: %s\n" % cve 305 write_string += "CVE: %s\n" % cve
306 if cve in whitelisted: 306 if cve in whitelisted:
307 write_string += "CVE STATUS: Whitelisted\n" 307 write_string += "CVE STATUS: Whitelisted\n"