[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5265/8267] wic: don't set creator.bootimg_dir in plugins

[Emmanuele Bassi <ebassi src gnome org>]

commit ce627abf86e31486070c1b24de92c30ce47bf0b8
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Wed Mar 22 15:42:26 2017 +0200

    wic: don't set creator.bootimg_dir in plugins
    
    Changing bootimg_dir in plugins is a dangerous hack as this
    value comes from wic command line and can be used by multiple
    plugins.
    
    (From OE-Core rev: 2457ea5338f7309316b474562b4723e8cb09286d)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/source/bootimg-efi.py    |    2 --
 scripts/lib/wic/plugins/source/bootimg-pcbios.py |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 2d793a5..2d1c4d4 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -189,8 +189,6 @@ class BootimgEFIPlugin(SourcePlugin):
             bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
             if not bootimg_dir:
                 raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting")
-            # just so the result notes display it
-            creator.bootimg_dir = bootimg_dir
 
         staging_kernel_dir = kernel_dir
 
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py 
b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index bd03eaa..1779520 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -153,8 +153,6 @@ class BootimgPcbiosPlugin(SourcePlugin):
                 raise WicError("Couldn't find STAGING_DATADIR, exiting")
             if not _has_syslinux(bootimg_dir):
                 raise WicError("Please build syslinux first")
-            # just so the result notes display it
-            creator.bootimg_dir = bootimg_dir
 
         staging_kernel_dir = kernel_dir