summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2014-10-29 17:04:24 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-30 13:03:30 +0000
commit3822f8a7b33da56ecd9144b4bcae50734fb1af81 (patch)
treea05cfde7800d3d6aa81de8a295c63977d3f2b46e
parent6ba3eb5ff7c47aee6b3419fb3a348a634fe74ac9 (diff)
downloadopenembedded-core-contrib-3822f8a7b33da56ecd9144b4bcae50734fb1af81.tar.gz
openembedded-core-contrib-3822f8a7b33da56ecd9144b4bcae50734fb1af81.tar.bz2
openembedded-core-contrib-3822f8a7b33da56ecd9144b4bcae50734fb1af81.zip
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. Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-partition.py9
1 files 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 cc72b2f7cb..abf24942e8 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),