summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-27 16:39:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:38:32 +0000
commitd5b2539213920f1ccc963003bf42988fa80937e2 (patch)
tree6765f4194c59b94584deeeea4053eec99a104a9a /scripts/lib/wic/plugins
parent1239f625b1cccb4876dc3a8b4a13834cf6bd515a (diff)
downloadpoky-d5b2539213920f1ccc963003bf42988fa80937e2.tar.gz
isoimage-isohybrid: renamed variable hdd_dir
Renamed variable hdd_dir to deploy_dir as this variable is assigned to the value of DEPLOY_DIR_IMAGE. (From OE-Core rev: fc84893c319f3e8c72f13c58f25e0b54095c3a49) Signed-off-by: Ed Bartosh <ed.bartosh@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/isoimage-isohybrid.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index e4637a3283..bceaa84398 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -249,7 +249,7 @@ class IsoImagePlugin(SourcePlugin):
249 part.rootfs_dir = rootfs_dir 249 part.rootfs_dir = rootfs_dir
250 250
251 # Prepare rootfs.img 251 # Prepare rootfs.img
252 hdd_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") 252 deploy_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
253 img_iso_dir = get_bitbake_var("ISODIR") 253 img_iso_dir = get_bitbake_var("ISODIR")
254 rootfs_img = "%s/rootfs.img" % img_iso_dir 254 rootfs_img = "%s/rootfs.img" % img_iso_dir
255 if not os.path.isfile(rootfs_img): 255 if not os.path.isfile(rootfs_img):
@@ -282,12 +282,12 @@ class IsoImagePlugin(SourcePlugin):
282 # Support using a different initrd other than default 282 # Support using a different initrd other than default
283 if source_params.get('initrd'): 283 if source_params.get('initrd'):
284 initrd = source_params['initrd'] 284 initrd = source_params['initrd']
285 if not hdd_dir: 285 if not deploy_dir:
286 msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") 286 msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n")
287 cp_cmd = "cp %s/%s %s" % (hdd_dir, initrd, cr_workdir) 287 cp_cmd = "cp %s/%s %s" % (deploy_dir, initrd, cr_workdir)
288 else: 288 else:
289 # Prepare initial ramdisk 289 # Prepare initial ramdisk
290 initrd = "%s/initrd" % hdd_dir 290 initrd = "%s/initrd" % deploy_dir
291 if not os.path.isfile(initrd): 291 if not os.path.isfile(initrd):
292 initrd = "%s/initrd" % img_iso_dir 292 initrd = "%s/initrd" % img_iso_dir
293 if not os.path.isfile(initrd): 293 if not os.path.isfile(initrd):