[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4349/8267] image_types.bbclass: rebuild .wks file when .wks.in changes

[Emmanuele Bassi <ebassi src gnome org>]

commit 46ed698f052f954e53328f81dc01221ac38a2031
Author: Patrick Ohly <patrick ohly intel com>
Date:   Wed Jan 25 12:07:48 2017 +0100

    image_types.bbclass: rebuild .wks file when .wks.in changes
    
    WKS_FILE(S) can refer to .wks.in files which get expanded during the
    build by do_write_wks_template. The actual content of the .wks.in file
    gets added to the recipe meta data during parsing, and thus we need to
    ensure that the recipe gets re-parsed when the file changes.
    
    This fixes two related problems:
    - editing the .wks.in file and rebuilding an image did not recreate
      the image unless something else changed or "bitbake -c clean" was
      used explicitly
    - when forcing a rebuild, the cached meta data and the actual one
      do not match, leading to "ERROR: Taskhash mismatch ... for ....bb.do_write_wks_template"
    
    (From OE-Core rev: d00b95b18237b276c221b16dfc511a6da150ef06)
    
    Signed-off-by: Patrick Ohly <patrick ohly intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image_types.bbclass |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 5b1746a..50545d9 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -265,6 +265,10 @@ python () {
             d.setVar('WKS_TEMPLATE_PATH', wks_file_u)
             d.setVar('WKS_FILE_CHECKSUM', '${WKS_TEMPLATE_PATH}:True')
 
+            # We need to re-parse each time the file changes, and bitbake
+            # needs to be told about that explicitly.
+            bb.parse.mark_dependency(d, wks_file)
+
             try:
                 with open(wks_file, 'r') as f:
                     body = f.read()