summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-02-08 22:14:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-16 18:05:40 +0000
commitccd664d8d0afb03a66f00804b919b9878962eea5 (patch)
tree4accbb0ab43abea920900703d0f61c7c35271624 /meta
parentdc62837cac8159141ee642b96d4f113c06083893 (diff)
downloadpoky-ccd664d8d0afb03a66f00804b919b9878962eea5.tar.gz
cve-check: put log in T so it doesn't get deleted by rm_work
This is where the other task logs go, so it's a sensible place to put it. (From OE-Core rev: 4bbb8cd5f3943231ab5be0448d1b0d4a08341249) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cve-check.bbclass7
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index bc2f03f7dd..62dd6424d5 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -27,8 +27,7 @@ CVE_PRODUCT ??= "${BPN}"
27CVE_CHECK_DB_DIR ?= "${DL_DIR}/CVE_CHECK" 27CVE_CHECK_DB_DIR ?= "${DL_DIR}/CVE_CHECK"
28CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/nvd.db" 28CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/nvd.db"
29 29
30CVE_CHECK_LOCAL_DIR ?= "${WORKDIR}/cve" 30CVE_CHECK_LOG ?= "${T}/cve.log"
31CVE_CHECK_LOCAL_FILE ?= "${CVE_CHECK_LOCAL_DIR}/cve.log"
32CVE_CHECK_TMP_FILE ?= "${TMPDIR}/cve_check" 31CVE_CHECK_TMP_FILE ?= "${TMPDIR}/cve_check"
33 32
34CVE_CHECK_DIR ??= "${DEPLOY_DIR}/cve" 33CVE_CHECK_DIR ??= "${DEPLOY_DIR}/cve"
@@ -251,11 +250,11 @@ def cve_write_data(d, patched, unpatched, cve_data):
251 CVE manifest if enabled. 250 CVE manifest if enabled.
252 """ 251 """
253 252
254 cve_file = d.getVar("CVE_CHECK_LOCAL_FILE") 253 cve_file = d.getVar("CVE_CHECK_LOG")
255 nvd_link = "https://web.nvd.nist.gov/view/vuln/detail?vulnId=" 254 nvd_link = "https://web.nvd.nist.gov/view/vuln/detail?vulnId="
256 write_string = "" 255 write_string = ""
257 unpatched_cves = [] 256 unpatched_cves = []
258 bb.utils.mkdirhier(d.getVar("CVE_CHECK_LOCAL_DIR")) 257 bb.utils.mkdirhier(os.path.dirname(cve_file))
259 258
260 for cve in sorted(cve_data): 259 for cve in sorted(cve_data):
261 write_string += "PACKAGE NAME: %s\n" % d.getVar("PN") 260 write_string += "PACKAGE NAME: %s\n" % d.getVar("PN")