diff options
author | Chris Laplante <chris.laplante@agilent.com> | 2020-09-29 11:57:45 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-04 17:39:08 +0000 |
commit | 51400abb8a2caa310f8516a7038ed765a465806c (patch) | |
tree | b78c5469f069eb70fd7e4a638aaff233de6d9b84 /meta | |
parent | 33ef86490180f6cf2851512ebe61df83e4958e64 (diff) | |
download | poky-51400abb8a2caa310f8516a7038ed765a465806c.tar.gz |
cve-check: introduce CVE_CHECK_RECIPE_FILE variable to allow changing of per-recipe check file
The addition of this variable also makes it possible to change the
output suffix of the check files, e.g. in local.conf:
CVE_CHECK_MANIFEST_append = ".txt"
CVE_CHECK_RECIPE_FILE_append = ".txt"
(From OE-Core rev: 7432d1048f70a36c7e8e7eafb480cd0ad835eb78)
Signed-off-by: Chris Laplante <chris.laplante@agilent.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0d40f1482c6d87785ae47c46c2305e1df46f459a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/cve-check.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index dbff852e18..259852876c 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass | |||
@@ -36,6 +36,7 @@ CVE_CHECK_SUMMARY_FILE_NAME ?= "cve-summary" | |||
36 | CVE_CHECK_SUMMARY_FILE ?= "${CVE_CHECK_SUMMARY_DIR}/${CVE_CHECK_SUMMARY_FILE_NAME}" | 36 | CVE_CHECK_SUMMARY_FILE ?= "${CVE_CHECK_SUMMARY_DIR}/${CVE_CHECK_SUMMARY_FILE_NAME}" |
37 | 37 | ||
38 | CVE_CHECK_DIR ??= "${DEPLOY_DIR}/cve" | 38 | CVE_CHECK_DIR ??= "${DEPLOY_DIR}/cve" |
39 | CVE_CHECK_RECIPE_FILE ?= "${CVE_CHECK_DIR}/${PN}" | ||
39 | CVE_CHECK_MANIFEST ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cve" | 40 | CVE_CHECK_MANIFEST ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cve" |
40 | CVE_CHECK_COPY_FILES ??= "1" | 41 | CVE_CHECK_COPY_FILES ??= "1" |
41 | CVE_CHECK_CREATE_MANIFEST ??= "1" | 42 | CVE_CHECK_CREATE_MANIFEST ??= "1" |
@@ -121,7 +122,7 @@ python cve_check_write_rootfs_manifest () { | |||
121 | import shutil | 122 | import shutil |
122 | 123 | ||
123 | if d.getVar("CVE_CHECK_COPY_FILES") == "1": | 124 | if d.getVar("CVE_CHECK_COPY_FILES") == "1": |
124 | deploy_file = os.path.join(d.getVar("CVE_CHECK_DIR"), d.getVar("PN")) | 125 | deploy_file = d.getVar("CVE_CHECK_RECIPE_FILE") |
125 | if os.path.exists(deploy_file): | 126 | if os.path.exists(deploy_file): |
126 | bb.utils.remove(deploy_file) | 127 | bb.utils.remove(deploy_file) |
127 | 128 | ||
@@ -362,9 +363,8 @@ def cve_write_data(d, patched, unpatched, whitelisted, cve_data): | |||
362 | f.write(write_string) | 363 | f.write(write_string) |
363 | 364 | ||
364 | if d.getVar("CVE_CHECK_COPY_FILES") == "1": | 365 | if d.getVar("CVE_CHECK_COPY_FILES") == "1": |
365 | cve_dir = d.getVar("CVE_CHECK_DIR") | 366 | deploy_file = d.getVar("CVE_CHECK_RECIPE_FILE") |
366 | bb.utils.mkdirhier(cve_dir) | 367 | bb.utils.mkdirhier(os.path.dirname(deploy_file)) |
367 | deploy_file = os.path.join(cve_dir, d.getVar("PN")) | ||
368 | with open(deploy_file, "w") as f: | 368 | with open(deploy_file, "w") as f: |
369 | f.write(write_string) | 369 | f.write(write_string) |
370 | 370 | ||