From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 24 Jul 2019 08:14:25 +0000 (+0100)
Subject: sstatesig: Update to handle BB_HASHSERVE
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=60e0cce134dc9ab66a719b1d9afb669deab323ec;p=openembedded-core.git

sstatesig: Update to handle BB_HASHSERVE

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index cfa647283c..cf653100a1 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -271,9 +271,13 @@ class SignatureGeneratorOEEquivHash(SignatureGeneratorOEBasicHash):
 
     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")