summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-09-16 12:49:45 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-18 17:52:01 +0100
commit34923e4f772fc57c29421741d2f622eb4009961c (patch)
tree76bda7c11d1deb7eb10f71741417f8d2c28f96cd
parentf12e41c1bbff01009018786b9c46e90103a2c728 (diff)
downloadpoky-34923e4f772fc57c29421741d2f622eb4009961c.tar.gz
Remove SSTATE_HASHEQUIV_SERVER
Removes all references to the SSTATE_HASHEQUIV_SERVER variable. This variable is redundant now that BB_HASHSERVE is present. (From OE-Core rev: 54b3adb6bc90a8e4b9e92952688772ee074d36e5) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass5
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/lib/oe/sstatesig.py8
3 files changed, 3 insertions, 12 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 11222223a9..b47b9c23bf 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -89,11 +89,6 @@ SSTATE_HASHEQUIV_METHOD[doc] = "The fully-qualified function used to calculate \
89 the output hash for a task, which in turn is used to determine equivalency. \ 89 the output hash for a task, which in turn is used to determine equivalency. \
90 " 90 "
91 91
92SSTATE_HASHEQUIV_SERVER ?= ""
93SSTATE_HASHEQUIV_SERVER[doc] = "The hash equivalence sever. For example, \
94 'http://192.168.0.1:5000'. Do not include a trailing slash \
95 "
96
97SSTATE_HASHEQUIV_REPORT_TASKDATA ?= "0" 92SSTATE_HASHEQUIV_REPORT_TASKDATA ?= "0"
98SSTATE_HASHEQUIV_REPORT_TASKDATA[doc] = "Report additional useful data to the \ 93SSTATE_HASHEQUIV_REPORT_TASKDATA[doc] = "Report additional useful data to the \
99 hash equivalency server, such as PN, PV, taskname, etc. This information \ 94 hash equivalency server, such as PN, PV, taskname, etc. This information \
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a0a7f4911e..263d8aea4f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -872,7 +872,7 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI
872 CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_NOHASHDIR LICENSE_PATH SDKPKGSUFFIX \ 872 CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_NOHASHDIR LICENSE_PATH SDKPKGSUFFIX \
873 WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ 873 WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \
874 BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot DEPLOY_DIR \ 874 BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot DEPLOY_DIR \
875 SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_SERVER SSTATE_HASHEQUIV_REPORT_TASKDATA \ 875 SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_REPORT_TASKDATA \
876 SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE" 876 SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE"
877BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ 877BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \
878 SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ 878 SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index b1ef5c039b..50d80bf51a 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -262,13 +262,9 @@ class SignatureGeneratorOEEquivHash(bb.siggen.SignatureGeneratorUniHashMixIn, Si
262 262
263 def init_rundepcheck(self, data): 263 def init_rundepcheck(self, data):
264 super().init_rundepcheck(data) 264 super().init_rundepcheck(data)
265 autostart = data.getVar('BB_HASHSERVE') 265 self.server = data.getVar('BB_HASHSERVE')
266 if autostart:
267 self.server = autostart
268 else:
269 self.server = data.getVar('SSTATE_HASHEQUIV_SERVER')
270 if not self.server: 266 if not self.server:
271 bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_SERVER or BB_HASHSERVE to be set") 267 bb.fatal("OEEquivHash requires BB_HASHSERVE to be set")
272 self.method = data.getVar('SSTATE_HASHEQUIV_METHOD') 268 self.method = data.getVar('SSTATE_HASHEQUIV_METHOD')
273 if not self.method: 269 if not self.method:
274 bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_METHOD to be set") 270 bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_METHOD to be set")