summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-08 20:44:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-13 09:28:14 +0100
commitea9fff4bd030266290e7f7aeef83603a02d35ae1 (patch)
tree9f496ec39900d9c6b947d31b91d2f5f23998bc06 /bitbake/lib
parentbb81ff1343d8d6213f0418fd18b10312c96c4617 (diff)
downloadpoky-ea9fff4bd030266290e7f7aeef83603a02d35ae1.tar.gz
bitbake: cooker/siggen: Reset siggen when reparsing
If we don't do this, we get basehash mismatch errors occurring from the reparse which would then set bitbake's error exit code. This for example would cause oe-selftest -r bbtests.BitbakeTests.test_bbappend_order to fail with a non-zero BB_SERVER_TIMEOUT. (Bitbake rev: e4c6ca9440f63761560b49bbe12654441f54687e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/cooker.py1
-rw-r--r--bitbake/lib/bb/siggen.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 81027db265..3740c61dc6 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1468,6 +1468,7 @@ class BBCooker:
1468 self.updateCacheSync() 1468 self.updateCacheSync()
1469 1469
1470 if self.state != state.parsing and not self.parsecache_valid: 1470 if self.state != state.parsing and not self.parsecache_valid:
1471 bb.parse.siggen.reset(self.data)
1471 self.parseConfiguration () 1472 self.parseConfiguration ()
1472 if CookerFeatures.SEND_SANITYEVENTS in self.featureset: 1473 if CookerFeatures.SEND_SANITYEVENTS in self.featureset:
1473 for mc in self.multiconfigs: 1474 for mc in self.multiconfigs:
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index f71190ad4b..4380760e77 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -94,6 +94,9 @@ class SignatureGeneratorBasic(SignatureGenerator):
94 else: 94 else:
95 self.checksum_cache = None 95 self.checksum_cache = None
96 96
97 def reset(self, data):
98 self.__init__(data)
99
97 def init_rundepcheck(self, data): 100 def init_rundepcheck(self, data):
98 self.taskwhitelist = data.getVar("BB_HASHTASK_WHITELIST") or None 101 self.taskwhitelist = data.getVar("BB_HASHTASK_WHITELIST") or None
99 if self.taskwhitelist: 102 if self.taskwhitelist: