diff options
author | Lee Chee Yang <chee.yang.lee@intel.com> | 2020-03-27 11:57:43 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-29 20:04:10 +0100 |
commit | 5cd9d19813d8cbe2e74d4fdbd424b6a15ca828c8 (patch) | |
tree | ecd657cebc8e66e8bf8524c184989f9f9d3472d9 | |
parent | d349d7bb68e3d7411562ca137080680ae3ad0c1a (diff) | |
download | poky-5cd9d19813d8cbe2e74d4fdbd424b6a15ca828c8.tar.gz |
cve-update-db-native: clean DB if temporary file exist
when do_populate_cve_db forced stop at certain point, the
DB execution are stoped however the temporary database
file (DB-JOURNAL) are not removed. This db-journal file
indicates that DB is incomplete and set DB in readonly
mode. So when db-journal exist, remove both DB and the
db-journal and build the DB again from scratch.
[YOCTO #13682]
(From OE-Core rev: 70713df25b8ae27a21e53b0b9234567d7053800a)
Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/meta/cve-update-db-native.bb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 95a0dfcc90..6afe09140b 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb | |||
@@ -13,8 +13,15 @@ deltask do_install | |||
13 | deltask do_populate_sysroot | 13 | deltask do_populate_sysroot |
14 | 14 | ||
15 | python () { | 15 | python () { |
16 | if not d.getVar("CVE_CHECK_DB_FILE"): | 16 | cve_check_db_file = d.getVar("CVE_CHECK_DB_FILE") |
17 | if not cve_check_db_file: | ||
17 | raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") | 18 | raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") |
19 | |||
20 | if os.path.exists("%s-journal" % cve_check_db_file ): | ||
21 | os.remove("%s-journal" % cve_check_db_file) | ||
22 | |||
23 | if os.path.exists(cve_check_db_file): | ||
24 | os.remove(cve_check_db_file) | ||
18 | } | 25 | } |
19 | 26 | ||
20 | python do_populate_cve_db() { | 27 | python do_populate_cve_db() { |