diff options
| author | Ross Burton <ross.burton@arm.com> | 2022-06-29 16:15:19 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-08 08:27:16 +0100 |
| commit | 611d7ed2acc8e74d0550b58926d0804a9eaa1079 (patch) | |
| tree | dbf17ddaf8dfa225221177d94ec7ce15891b119e | |
| parent | e6116b7ae0cbaf04402f1d3780c78ccc0a36ea57 (diff) | |
| download | poky-611d7ed2acc8e74d0550b58926d0804a9eaa1079.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.
(From OE-Core rev: 6f9c806dd1580a80856a687a2ad3a0b32d74dd17)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 () { | |||
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | addhandler cve_check_cleanup | 168 | addhandler cve_check_cleanup |
| 169 | cve_check_cleanup[eventmask] = "bb.cooker.CookerExit" | 169 | cve_check_cleanup[eventmask] = "bb.event.BuildCompleted" |
| 170 | 170 | ||
| 171 | python cve_check_write_rootfs_manifest () { | 171 | python cve_check_write_rootfs_manifest () { |
| 172 | """ | 172 | """ |
