sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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)

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Zanussi 2014-10-29 17:04:24 -05:00 committed by Richard Purdie
parent 42d0334aa8
commit fcf56083b9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/lib/wic/plugins/source/bootimg-partition.py
View File

@ -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),