summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-10 16:00:18 +0000
committerSteve Sakoman <steve@sakoman.com>2023-06-27 05:24:36 -1000
commit5127d9978556d3ed837275c105b2e3b4d7f4c002 (patch)
treeab40c40d4abdd156657b85cf80bee10415c87918
parentff22728dd557b20eff8186f61cf28f2ac1b27d40 (diff)
downloadpoky-5127d9978556d3ed837275c105b2e3b4d7f4c002.tar.gz
uninative: Ensure uninative is enabled in all cases for BuildStarted event
Recent changes in bitbake mean the datastore is not always reset between ConfigParsed and BuildStarted. This means in a fresh buiild, with memory resident bitbake active, uninative may end up disabled. Update the code so the enable code is always run at BuildStarted if needed. (From OE-Core rev: 24897c70980f934cf59a28a0d3b6e8fddcb15a7f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit db743cc78fe5172bb4a4dac9c1dad4f5aa9e1491) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/classes/uninative.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass
index 4412d7c567..2940935dd7 100644
--- a/meta/classes/uninative.bbclass
+++ b/meta/classes/uninative.bbclass
@@ -34,6 +34,8 @@ python uninative_event_fetchloader() {
34 with open(loaderchksum, "r") as f: 34 with open(loaderchksum, "r") as f:
35 readchksum = f.read().strip() 35 readchksum = f.read().strip()
36 if readchksum == chksum: 36 if readchksum == chksum:
37 if "uninative" not in d.getVar("SSTATEPOSTUNPACKFUNCS"):
38 enable_uninative(d)
37 return 39 return
38 40
39 import subprocess 41 import subprocess