From ccd664d8d0afb03a66f00804b919b9878962eea5 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 8 Feb 2018 22:14:58 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/cve-check.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'meta') 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}" CVE_CHECK_DB_DIR ?= "${DL_DIR}/CVE_CHECK" CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/nvd.db" -CVE_CHECK_LOCAL_DIR ?= "${WORKDIR}/cve" -CVE_CHECK_LOCAL_FILE ?= "${CVE_CHECK_LOCAL_DIR}/cve.log" +CVE_CHECK_LOG ?= "${T}/cve.log" CVE_CHECK_TMP_FILE ?= "${TMPDIR}/cve_check" CVE_CHECK_DIR ??= "${DEPLOY_DIR}/cve" @@ -251,11 +250,11 @@ def cve_write_data(d, patched, unpatched, cve_data): CVE manifest if enabled. """ - cve_file = d.getVar("CVE_CHECK_LOCAL_FILE") + cve_file = d.getVar("CVE_CHECK_LOG") nvd_link = "https://web.nvd.nist.gov/view/vuln/detail?vulnId=" write_string = "" unpatched_cves = [] - bb.utils.mkdirhier(d.getVar("CVE_CHECK_LOCAL_DIR")) + bb.utils.mkdirhier(os.path.dirname(cve_file)) for cve in sorted(cve_data): write_string += "PACKAGE NAME: %s\n" % d.getVar("PN") -- cgit v1.2.3-54-g00ecf