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>
This commit is contained in:
Richard Purdie
2017-08-08 20:44:36 +01:00
parent bb81ff1343
commit ea9fff4bd0
2 changed files with 4 additions and 0 deletions

View File

@@ -1468,6 +1468,7 @@ class BBCooker:
self.updateCacheSync()
if self.state != state.parsing and not self.parsecache_valid:
bb.parse.siggen.reset(self.data)
self.parseConfiguration ()
if CookerFeatures.SEND_SANITYEVENTS in self.featureset:
for mc in self.multiconfigs:

View File

@@ -94,6 +94,9 @@ class SignatureGeneratorBasic(SignatureGenerator):
else:
self.checksum_cache = None
def reset(self, data):
self.__init__(data)
def init_rundepcheck(self, data):
self.taskwhitelist = data.getVar("BB_HASHTASK_WHITELIST") or None
if self.taskwhitelist: