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]

(From OE-Core rev: de1782b23f8a98df3b42cb57bbcdff690bfa2343)

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 d35a6f64d9702555fc9154ed275361202bd4c1f9..14b0764f222782578809225a1357a1e6cde0b338 100644 (file)
--- 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}"