Update bootimg-partition to use bootimg_dir instead of img_deploy_dir,
to match similar usage in other plugins.
As mentioned elsewhere, plugins should use the passed-in value for
bootimg_dir directly if non-null, which corresponds to a user-assigned
value specified via a -b command-line param, and only fetch the value
from bitbake if that value is null.
(From OE-Core rev:
3822f8a7b33da56ecd9144b4bcae50734fb1af81)
(From OE-Core rev:
f22bd26627595e3719d3b1f9e3d487d5011c9c42)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
install_cmd = "install -d %s" % hdddir
exec_cmd(install_cmd)
+ if not bootimg_dir:
+ bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
+ if not bootimg_dir:
+ msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n")
+
msger.debug('Bootimg dir: %s' % bootimg_dir)
- img_deploy_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
+
boot_files = get_bitbake_var("IMAGE_BOOT_FILES")
if not boot_files:
for deploy_entry in deploy_files:
src, dst = deploy_entry
- src_path = os.path.join(img_deploy_dir, src)
+ src_path = os.path.join(bootimg_dir, src)
dst_path = os.path.join(hdddir, dst)
msger.debug('Install %s as %s' % (os.path.basename(src_path),