From: Ed Bartosh Date: Wed, 22 Mar 2017 13:42:26 +0000 (+0200) Subject: wic: don't set creator.bootimg_dir in plugins X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~21930 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2457ea5338f7309316b474562b4723e8cb09286d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- 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