[oe-commits] [openembedded-core] 31/40: image.bbclass: Do not expand variables in IMAGE_CMD vardepsexclude

[git at git.openembedded.org]

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

commit 6add88d98dd38453ef861852a0b5572804d125d6
Author: Jonathan Liu <net147 at gmail.com>
AuthorDate: Sun Sep 11 22:14:16 2016 +1000

    image.bbclass: Do not expand variables in IMAGE_CMD vardepsexclude
    
    This fixes tashhash mismatch errors creating images when IMAGE_CMD
    references a variable whose value is always changing even though the
    variable is specified in IMAGE_CMD vardepsexclude.
    
    Signed-off-by: Jonathan Liu <net147 at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/image.bbclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 8273401..8a824fc 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -441,6 +441,10 @@ python () {
         localdata.delVar('DATETIME')
         localdata.delVar('TMPDIR')
 
+        vardepsexclude = d.getVarFlag('IMAGE_CMD', 'vardepsexclude', True) or ''
+        vardepsexclude += ' ' + (d.getVarFlag('IMAGE_CMD_' + realt, 'vardepsexclude', True) or '')
+        for var in vardepsexclude.split():
+            localdata.delVar(var)
         image_cmd = localdata.getVar("IMAGE_CMD", True)
         vardeps.add('IMAGE_CMD_' + realt)
         if image_cmd:

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