[OE-core] [zeus 03/28] sstate: Ensure SSTATE_PKG is reloaded when handling siginfo

Armin Kuster akuster808 at gmail.com
Thu Jan 9 04:49:22 UTC 2020


From: Richard Purdie <richard.purdie at linuxfoundation.org>

STATE_PKG may have been changed by sstate_report_unihash so don't
cache the variable's value.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
(cherry picked from commit be29a25400c4ea285ab3f588c5831f00ba5d4f63)
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/classes/sstate.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index eb1ecd6822..a46dd2e210 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -664,7 +664,8 @@ def sstate_package(ss, d):
         # All hooks should run in SSTATE_BUILDDIR.
         bb.build.exec_func(f, d, (sstatebuild,))
 
-    bb.siggen.dump_this_task(sstatepkg + ".siginfo", d)
+    # SSTATE_PKG may have been changed by sstate_report_unihash
+    bb.siggen.dump_this_task(d.getVar('SSTATE_PKG') + ".siginfo", d)
 
     return
 
-- 
2.17.1



More information about the Openembedded-core mailing list