diff options
author | Ross Burton <ross.burton@arm.com> | 2022-06-29 16:15:19 +0100 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2022-07-01 06:23:58 -1000 |
commit | 6f9c806dd1580a80856a687a2ad3a0b32d74dd17 (patch) | |
tree | 78c4bc2cb7891b9e3910ef848d53165025a367c1 | |
parent | 94fad58c6f10d0dfc42be816b0a7f6b108bd03e6 (diff) | |
download | openembedded-core-contrib-6f9c806dd1580a80856a687a2ad3a0b32d74dd17.tar.gz |
cve-check: hook cleanup to the BuildCompleted event, not CookerExit
The cve-check class writes temporary files to preserve state across the
build, and cleans them up in a CookerExit handler.
However, in memory-resident builds the cooker won't exit in between
builds, so the state isn't cleared and the CVE report generation fails:
NOTE: Generating JSON CVE summary
ERROR: Error adding the same package twice
Easily solved by hooking to BuildCompleted, instead of CookerExit.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit fccdcfd301de281a427bfee48d8ff47fa07b7259)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/classes/cve-check.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 50b9247f46..da7f93371c 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -166,7 +166,7 @@ python cve_check_cleanup () { } addhandler cve_check_cleanup -cve_check_cleanup[eventmask] = "bb.cooker.CookerExit" +cve_check_cleanup[eventmask] = "bb.event.BuildCompleted" python cve_check_write_rootfs_manifest () { """ |