summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2021-09-11 07:56:28 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-11 22:39:19 +0100
commitd584f9c6bd4cb074e0e5d3e263543294f47f84f0 (patch)
tree8b65014e48f0320c6288d65c7e95b2592e6572dd
parent15c87c405f2893208cb94cba2713db9e5e8204a6 (diff)
downloadpoky-d584f9c6bd4cb074e0e5d3e263543294f47f84f0.tar.gz
bitbake: cooker: Allow upstream for local hash equivalence server
The hash equivalence server has had the option to support a read-only upstream server for some time now when launched as a standalone program, but there was no way to set the upstream when using a locally started server. Add a new variable called BB_HASHSERVE_UPSTREAM that can be used to specify an upstream server when a local hash equivalence server is used (e.g. BB_HASHSERVE is "auto") (Bitbake rev: 250fa17f1391ff1ee01ab9b51d2a4f9aa35c1d1e) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index db991702e2..1f55d9ad73 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -389,7 +389,12 @@ class BBCooker:
389 if not self.hashserv: 389 if not self.hashserv:
390 dbfile = (self.data.getVar("PERSISTENT_DIR") or self.data.getVar("CACHE")) + "/hashserv.db" 390 dbfile = (self.data.getVar("PERSISTENT_DIR") or self.data.getVar("CACHE")) + "/hashserv.db"
391 self.hashservaddr = "unix://%s/hashserve.sock" % self.data.getVar("TOPDIR") 391 self.hashservaddr = "unix://%s/hashserve.sock" % self.data.getVar("TOPDIR")
392 self.hashserv = hashserv.create_server(self.hashservaddr, dbfile, sync=False) 392 self.hashserv = hashserv.create_server(
393 self.hashservaddr,
394 dbfile,
395 sync=False,
396 upstream=self.data.getVar("BB_HASHSERVE_UPSTREAM") or None,
397 )
393 self.hashserv.serve_as_process() 398 self.hashserv.serve_as_process()
394 self.data.setVar("BB_HASHSERVE", self.hashservaddr) 399 self.data.setVar("BB_HASHSERVE", self.hashservaddr)
395 self.databuilder.origdata.setVar("BB_HASHSERVE", self.hashservaddr) 400 self.databuilder.origdata.setVar("BB_HASHSERVE", self.hashservaddr)