diff options
-rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
-rw-r--r-- | meta/lib/oe/sstatesig.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 140f45b895..ddcac09c5c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -885,7 +885,7 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI | |||
885 | WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ | 885 | WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ |
886 | BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot DEPLOY_DIR \ | 886 | BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot DEPLOY_DIR \ |
887 | SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_SERVER SSTATE_HASHEQUIV_REPORT_TASKDATA \ | 887 | SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_SERVER SSTATE_HASHEQUIV_REPORT_TASKDATA \ |
888 | SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR" | 888 | SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE" |
889 | BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ | 889 | BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ |
890 | SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ | 890 | SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ |
891 | PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ | 891 | PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ |
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index f1a5af69c5..3f926e3e51 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py | |||
@@ -271,9 +271,13 @@ class SignatureGeneratorOEEquivHash(bb.siggen.SignatureGeneratorUniHashMixIn, Si | |||
271 | 271 | ||
272 | def init_rundepcheck(self, data): | 272 | def init_rundepcheck(self, data): |
273 | super().init_rundepcheck(data) | 273 | super().init_rundepcheck(data) |
274 | self.server = data.getVar('SSTATE_HASHEQUIV_SERVER') | 274 | autostart = data.getVar('BB_HASHSERVE') |
275 | if autostart: | ||
276 | self.server = "http://" + autostart | ||
277 | else: | ||
278 | self.server = data.getVar('SSTATE_HASHEQUIV_SERVER') | ||
275 | if not self.server: | 279 | if not self.server: |
276 | bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_SERVER to be set") | 280 | bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_SERVER or BB_HASHSERVE to be set") |
277 | self.method = data.getVar('SSTATE_HASHEQUIV_METHOD') | 281 | self.method = data.getVar('SSTATE_HASHEQUIV_METHOD') |
278 | if not self.method: | 282 | if not self.method: |
279 | bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_METHOD to be set") | 283 | bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_METHOD to be set") |