From: Joshua Watt <jpewhacker@gmail.com>
Date: Wed, 1 May 2019 20:35:23 +0000 (-0500)
Subject: bitbake.conf: Account for older versions of bitbake
X-Git-Tag: uninative-2.5~270
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=de1782b23f8a98df3b42cb57bbcdff690bfa2343;p=openembedded-core.git

bitbake.conf: Account for older versions of bitbake

Older versions of bitbake (prior to 1.42) don't expose the BB_UNIHASH
variable which is being used by sstate. For compatibility with these
older versions of bitbake, set BB_UNIHASH to BB_TASKHASH (which is the
value it should be for non-hash equivalent aware signature generators).
if bitbake hasn't already set it.

[YOCTO #13314]

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d35a6f64d9..14b0764f22 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -901,3 +901,9 @@ BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \
 
 MLPREFIX ??= ""
 MULTILIB_VARIANTS ??= ""
+
+# Older versions of bitbake (< 1.42) don't set BB_UNIHASH. For compatibility with these
+# versions, set BB_UNIHASH equivalent to BB_TASKHASH if unspecified, which is
+# what it would be anyway if the signature generator (e.g. OEEquivHash) doesn't
+# support unihashes.
+BB_UNIHASH ?= "${BB_TASKHASH}"