diff options
author | Ross Burton <ross@burtonini.com> | 2020-09-10 22:04:13 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-12 14:49:00 +0100 |
commit | 33efd9351702e08a53e6512e235f947e4f9e914f (patch) | |
tree | fe9d6adf513ae315aad2f43162bb1824c558d25b /meta/recipes-core | |
parent | f0d9c8926be8ef9f21e3707de4a449ed63ea9067 (diff) | |
download | poky-33efd9351702e08a53e6512e235f947e4f9e914f.tar.gz |
cve-update-db-native: use fetch task
Instead of inventing a new task to fetch the CVE data, use the existing
fetch task.
(From OE-Core rev: f5f97d33a1703d75b9fd9760f2c7767081538e00)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/meta/cve-update-db-native.bb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 27b4c58d4e..e4e2451bfd 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb | |||
@@ -24,7 +24,7 @@ python () { | |||
24 | os.remove(cve_check_db_file) | 24 | os.remove(cve_check_db_file) |
25 | } | 25 | } |
26 | 26 | ||
27 | python do_populate_cve_db() { | 27 | python do_fetch() { |
28 | """ | 28 | """ |
29 | Update NVD database with json data feed | 29 | Update NVD database with json data feed |
30 | """ | 30 | """ |
@@ -114,7 +114,9 @@ python do_populate_cve_db() { | |||
114 | conn.close() | 114 | conn.close() |
115 | } | 115 | } |
116 | 116 | ||
117 | do_populate_cve_db[lockfiles] += "${CVE_CHECK_DB_FILE_LOCK}" | 117 | do_fetch[lockfiles] += "${CVE_CHECK_DB_FILE_LOCK}" |
118 | do_fetch[file-checksums] = "" | ||
119 | do_fetch[vardeps] = "" | ||
118 | 120 | ||
119 | def initialize_db(c): | 121 | def initialize_db(c): |
120 | c.execute("CREATE TABLE IF NOT EXISTS META (YEAR INTEGER UNIQUE, DATE TEXT)") | 122 | c.execute("CREATE TABLE IF NOT EXISTS META (YEAR INTEGER UNIQUE, DATE TEXT)") |
@@ -206,7 +208,6 @@ def update_db(c, jsondata): | |||
206 | parse_node_and_insert(c, config, cveId) | 208 | parse_node_and_insert(c, config, cveId) |
207 | 209 | ||
208 | 210 | ||
209 | addtask do_populate_cve_db before do_fetch | 211 | do_fetch[nostamp] = "1" |
210 | do_populate_cve_db[nostamp] = "1" | ||
211 | 212 | ||
212 | EXCLUDE_FROM_WORLD = "1" | 213 | EXCLUDE_FROM_WORLD = "1" |