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: 1ed53d5cfc2be40b2d57b5392ec4d30313209934)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f5f97d33a1703d75b9fd9760f2c7767081538e00)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2020-09-10 22:04:13 +01:00
committed by Richard Purdie
parent ee9345f864
commit ee62d4540e
2 changed files with 6 additions and 5 deletions

View File

@@ -110,7 +110,7 @@ python do_cve_check () {
}
addtask cve_check before do_build after do_fetch
do_cve_check[depends] = "cve-update-db-native:do_populate_cve_db"
do_cve_check[depends] = "cve-update-db-native:do_fetch"
do_cve_check[nostamp] = "1"
python cve_check_cleanup () {

View File

@@ -17,7 +17,7 @@ python () {
raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.")
}
python do_populate_cve_db() {
python do_fetch() {
"""
Update NVD database with json data feed
"""
@@ -110,7 +110,9 @@ python do_populate_cve_db() {
conn.close()
}
do_populate_cve_db[lockfiles] += "${CVE_CHECK_DB_FILE_LOCK}"
do_fetch[lockfiles] += "${CVE_CHECK_DB_FILE_LOCK}"
do_fetch[file-checksums] = ""
do_fetch[vardeps] = ""
def initialize_db(c):
c.execute("CREATE TABLE IF NOT EXISTS META (YEAR INTEGER UNIQUE, DATE TEXT)")
@@ -217,7 +219,6 @@ def update_db(c, jsondata):
parse_node_and_insert(c, config, cveId)
addtask do_populate_cve_db before do_fetch
do_populate_cve_db[nostamp] = "1"
do_fetch[nostamp] = "1"
EXCLUDE_FROM_WORLD = "1"