[oe-commits] [openembedded-core] branch master-next updated: bitbake.conf: Account for older versions of bitbake

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

The following commit(s) were added to refs/heads/master-next by this push:
     new 4ca5516  bitbake.conf: Account for older versions of bitbake
4ca5516 is described below

commit 4ca5516d72ddfa37cc1a6235043e1d164861dab6
Author: Joshua Watt <jpewhacker at gmail.com>
AuthorDate: Wed May 1 15:35:23 2019 -0500

    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 at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/conf/bitbake.conf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d35a6f6..14b0764 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}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.