From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 1 Oct 2021 13:00:39 +0000 (+0100)
Subject: image: Exclude IMAGE_VERSION_SUFFIX from expansion in image tasks
X-Git-Tag: yocto-3.4~31
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ceabe8b89f8a0b75d22a286e6f86d260f7e2fd3b;p=openembedded-core.git

image: Exclude IMAGE_VERSION_SUFFIX from expansion in image tasks

Similarly to DATETIME, exclude IMAGE_VERSION_SUFFIX from expansion in
image tasks to ensure the sstate signatures are calculated correctly.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 1d88ccd819..c2f3232027 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -434,6 +434,7 @@ python () {
         localdata.delVar('DATETIME')
         localdata.delVar('DATE')
         localdata.delVar('TMPDIR')
+        localdata.delVar('IMAGE_VERSION_SUFFIX')
         vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude', True) or '').split()
         for dep in vardepsexclude:
             localdata.delVar(dep)