mirror of
https://git.yoctoproject.org/poky
synced 2026-05-07 16:59:22 +00:00
sstatesig: Update to handle BB_HASHSERVE
Update the code to handle BB_HASHSERV, an autostarted bitbake internal hash equivalency server suited to local developer usage. (From OE-Core rev: 9b3d7b0b0ff27281391c2b8f2511d312d6995ed6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -885,7 +885,7 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI
|
||||
WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \
|
||||
BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot DEPLOY_DIR \
|
||||
SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_SERVER SSTATE_HASHEQUIV_REPORT_TASKDATA \
|
||||
SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR"
|
||||
SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE"
|
||||
BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \
|
||||
SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \
|
||||
PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \
|
||||
|
||||
@@ -271,9 +271,13 @@ class SignatureGeneratorOEEquivHash(bb.siggen.SignatureGeneratorUniHashMixIn, Si
|
||||
|
||||
def init_rundepcheck(self, data):
|
||||
super().init_rundepcheck(data)
|
||||
self.server = data.getVar('SSTATE_HASHEQUIV_SERVER')
|
||||
autostart = data.getVar('BB_HASHSERVE')
|
||||
if autostart:
|
||||
self.server = "http://" + autostart
|
||||
else:
|
||||
self.server = data.getVar('SSTATE_HASHEQUIV_SERVER')
|
||||
if not self.server:
|
||||
bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_SERVER to be set")
|
||||
bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_SERVER or BB_HASHSERVE to be set")
|
||||
self.method = data.getVar('SSTATE_HASHEQUIV_METHOD')
|
||||
if not self.method:
|
||||
bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_METHOD to be set")
|
||||
|
||||
Reference in New Issue
Block a user