From 31e5c82099ac0daf3743c967db0e53c6007c99f1 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Wed, 26 Nov 2014 08:22:09 -0800 Subject: [PATCH] wic: Update bootimg-partition to use bootimg_dir 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 Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie Signed-off-by: Patrick Ohly --- scripts/lib/wic/plugins/source/bootimg-partition.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py index cc72b2f..abf2494 100644 --- a/scripts/lib/wic/plugins/source/bootimg-partition.py +++ b/scripts/lib/wic/plugins/source/bootimg-partition.py @@ -71,8 +71,13 @@ class BootimgPartitionPlugin(SourcePlugin): 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: @@ -93,7 +98,7 @@ class BootimgPartitionPlugin(SourcePlugin): 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), -- 2.7.4