summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins
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:41 +0000
commitfcf56083b94c07946897a997a9d7c3e143e0a367 (patch)
tree4d5031289bcdbbe4b77bf1a8f4420f35c8417837 /scripts/lib/wic/plugins
parent42d0334aa8bf59937262f957f2ea04abc271138b (diff)
downloadpoky-fcf56083b94c07946897a997a9d7c3e143e0a367.tar.gz
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>
Diffstat (limited to 'scripts/lib/wic/plugins')
-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):
71 install_cmd = "install -d %s" % hdddir 71 install_cmd = "install -d %s" % hdddir
72 exec_cmd(install_cmd) 72 exec_cmd(install_cmd)
73 73
74 if not bootimg_dir:
75 bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
76 if not bootimg_dir:
77 msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n")
78
74 msger.debug('Bootimg dir: %s' % bootimg_dir) 79 msger.debug('Bootimg dir: %s' % bootimg_dir)
75 img_deploy_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") 80
76 boot_files = get_bitbake_var("IMAGE_BOOT_FILES") 81 boot_files = get_bitbake_var("IMAGE_BOOT_FILES")
77 82
78 if not boot_files: 83 if not boot_files:
@@ -93,7 +98,7 @@ class BootimgPartitionPlugin(SourcePlugin):
93 98
94 for deploy_entry in deploy_files: 99 for deploy_entry in deploy_files:
95 src, dst = deploy_entry 100 src, dst = deploy_entry
96 src_path = os.path.join(img_deploy_dir, src) 101 src_path = os.path.join(bootimg_dir, src)
97 dst_path = os.path.join(hdddir, dst) 102 dst_path = os.path.join(hdddir, dst)
98 103
99 msger.debug('Install %s as %s' % (os.path.basename(src_path), 104 msger.debug('Install %s as %s' % (os.path.basename(src_path),