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.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 2d793a5cb7d1ef7c0b9c774d84b60faedc37df3a..2d1c4d4089720b57324a645798c118a2ff248be3 100644 (file)
--- 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 bd03eaa2286570dddf67c4c8490298a45a59ccb9..17795200441f9fd1375a2556f3983850aeaea8be 100644 (file)
--- 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