summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-12-08 20:35:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-16 22:38:52 +0000
commit55bec749c027050328a050c6a2688179ce973a9e (patch)
treef5af09f51a6795c42491745d45680d0fedb69c7f
parent933a0a255f7bdad6f45f997805c99e0ae50c0294 (diff)
downloadpoky-55bec749c027050328a050c6a2688179ce973a9e.tar.gz
cve-update-db-native: don't hardcode the database name
Don't hardcode the database filename, there's a variable for this in cve-check.bbclass. (From OE-Core rev: 0d188a9dc4ae64c64cd661e9d9c3841e86f226ab) (From OE-Core rev: f774665ee4dcdc5a1fe1f51384d82fb8e1b219e1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/meta/cve-update-db-native.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb
index 19875a49b1..c15534de08 100644
--- a/meta/recipes-core/meta/cve-update-db-native.bb
+++ b/meta/recipes-core/meta/cve-update-db-native.bb
@@ -28,8 +28,8 @@ python do_populate_cve_db() {
28 BASE_URL = "https://nvd.nist.gov/feeds/json/cve/1.0/nvdcve-1.0-" 28 BASE_URL = "https://nvd.nist.gov/feeds/json/cve/1.0/nvdcve-1.0-"
29 YEAR_START = 2002 29 YEAR_START = 2002
30 30
31 db_dir = os.path.join(d.getVar("DL_DIR"), 'CVE_CHECK') 31 db_file = d.getVar("CVE_CHECK_DB_FILE")
32 db_file = os.path.join(db_dir, 'nvdcve_1.0.db') 32 db_dir = os.path.dirname(db_file)
33 json_tmpfile = os.path.join(db_dir, 'nvd.json.gz') 33 json_tmpfile = os.path.join(db_dir, 'nvd.json.gz')
34 34
35 # Don't refresh the database more than once an hour 35 # Don't refresh the database more than once an hour