diff options
| author |   Ross Burton <ross.burton@arm.com> | 2022-06-29 16:15:19 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-07-05 10:04:09 -1000 |
| commit | ee3270709158aff463fec6798f3b8968268b4d4b (patch) | |
| tree | 3c088f90ed0bb2fa45054d602184ff66bfadd86e | |
| parent | b82c95720488eea8ea4b5684c9f89e4931085fa5 (diff) | |
| download | openembedded-core-ee3270709158aff463fec6798f3b8968268b4d4b.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 d0f6970db8..1688fe2dfe 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -164,7 +164,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 () { """ |