summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2022-06-29 16:15:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-15 12:29:17 +0100
commit1c38d0d3d66fa8f04b0a4cde11decc5873573ea6 (patch)
treef0c13e21259b67e02cda6982bd4033e3c1cc685e /meta/classes
parentca90350d1370e46715075f3d5ac5fd87da258423 (diff)
downloadpoky-1c38d0d3d66fa8f04b0a4cde11decc5873573ea6.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: ee3270709158aff463fec6798f3b8968268b4d4b) 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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/cve-check.bbclass2
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 () {
164} 164}
165 165
166addhandler cve_check_cleanup 166addhandler cve_check_cleanup
167cve_check_cleanup[eventmask] = "bb.cooker.CookerExit" 167cve_check_cleanup[eventmask] = "bb.event.BuildCompleted"
168 168
169python cve_check_write_rootfs_manifest () { 169python cve_check_write_rootfs_manifest () {
170 """ 170 """