From ca38b2f88f640579703486645b0c4d9ecef78e47 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Wed, 1 May 2019 15:35:23 -0500 Subject: [PATCH] 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 Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/conf/bitbake.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 7f8b043cc4..b4e8990473 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -898,3 +898,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}" -- 2.40.1