diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-03-22 15:42:26 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-23 13:19:49 +0000 |
commit | ce627abf86e31486070c1b24de92c30ce47bf0b8 (patch) | |
tree | 841e8daac4176943ecc47378803114f7ff762535 /scripts/lib | |
parent | d38d526991fa8e9e928eb3320f3b10a95bd76489 (diff) | |
download | poky-ce627abf86e31486070c1b24de92c30ce47bf0b8.tar.gz |
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>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 2 | ||||
-rw-r--r-- | 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 2d793a5cb7..2d1c4d4089 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): | |||
189 | bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") | 189 | bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") |
190 | if not bootimg_dir: | 190 | if not bootimg_dir: |
191 | raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") | 191 | raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") |
192 | # just so the result notes display it | ||
193 | creator.bootimg_dir = bootimg_dir | ||
194 | 192 | ||
195 | staging_kernel_dir = kernel_dir | 193 | staging_kernel_dir = kernel_dir |
196 | 194 | ||
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index bd03eaa228..1779520044 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): | |||
153 | raise WicError("Couldn't find STAGING_DATADIR, exiting") | 153 | raise WicError("Couldn't find STAGING_DATADIR, exiting") |
154 | if not _has_syslinux(bootimg_dir): | 154 | if not _has_syslinux(bootimg_dir): |
155 | raise WicError("Please build syslinux first") | 155 | raise WicError("Please build syslinux first") |
156 | # just so the result notes display it | ||
157 | creator.bootimg_dir = bootimg_dir | ||
158 | 156 | ||
159 | staging_kernel_dir = kernel_dir | 157 | staging_kernel_dir = kernel_dir |
160 | 158 | ||