diff options
-rw-r--r-- | meta/classes/cve-check.bbclass | 2 | ||||
-rw-r--r-- | meta/recipes-core/meta/cve-update-db-native.bb | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index b6df2c31da..97cbc63d1d 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass | |||
@@ -110,7 +110,7 @@ python do_cve_check () { | |||
110 | } | 110 | } |
111 | 111 | ||
112 | addtask cve_check before do_build after do_fetch | 112 | addtask cve_check before do_build after do_fetch |
113 | do_cve_check[depends] = "cve-update-db-native:do_populate_cve_db" | 113 | do_cve_check[depends] = "cve-update-db-native:do_fetch" |
114 | do_cve_check[nostamp] = "1" | 114 | do_cve_check[nostamp] = "1" |
115 | 115 | ||
116 | python cve_check_cleanup () { | 116 | python cve_check_cleanup () { |
diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index e86c69803f..50052f8532 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb | |||
@@ -17,7 +17,7 @@ python () { | |||
17 | raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") | 17 | raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") |
18 | } | 18 | } |
19 | 19 | ||
20 | python do_populate_cve_db() { | 20 | python do_fetch() { |
21 | """ | 21 | """ |
22 | Update NVD database with json data feed | 22 | Update NVD database with json data feed |
23 | """ | 23 | """ |
@@ -110,7 +110,9 @@ python do_populate_cve_db() { | |||
110 | conn.close() | 110 | conn.close() |
111 | } | 111 | } |
112 | 112 | ||
113 | do_populate_cve_db[lockfiles] += "${CVE_CHECK_DB_FILE_LOCK}" | 113 | do_fetch[lockfiles] += "${CVE_CHECK_DB_FILE_LOCK}" |
114 | do_fetch[file-checksums] = "" | ||
115 | do_fetch[vardeps] = "" | ||
114 | 116 | ||
115 | def initialize_db(c): | 117 | def initialize_db(c): |
116 | c.execute("CREATE TABLE IF NOT EXISTS META (YEAR INTEGER UNIQUE, DATE TEXT)") | 118 | c.execute("CREATE TABLE IF NOT EXISTS META (YEAR INTEGER UNIQUE, DATE TEXT)") |
@@ -217,7 +219,6 @@ def update_db(c, jsondata): | |||
217 | parse_node_and_insert(c, config, cveId) | 219 | parse_node_and_insert(c, config, cveId) |
218 | 220 | ||
219 | 221 | ||
220 | addtask do_populate_cve_db before do_fetch | 222 | do_fetch[nostamp] = "1" |
221 | do_populate_cve_db[nostamp] = "1" | ||
222 | 223 | ||
223 | EXCLUDE_FROM_WORLD = "1" | 224 | EXCLUDE_FROM_WORLD = "1" |