aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-03-22 15:42:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-22 15:07:37 +0000
commit2457ea5338f7309316b474562b4723e8cb09286d (patch)
treeab43d9134a70f0d450d7fc48a6eb8362ab149ea4
parent6d162118a2567ccbcdbc2a9ca14a8c358fa1a055 (diff)
downloadopenembedded-core-contrib-2457ea5338f7309316b474562b4723e8cb09286d.tar.gz
openembedded-core-contrib-2457ea5338f7309316b474562b4723e8cb09286d.tar.bz2
openembedded-core-contrib-2457ea5338f7309316b474562b4723e8cb09286d.zip
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>
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py2
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py2
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 2d793a5cb7d..2d1c4d40897 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 bd03eaa2286..17795200441 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