mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

isoimage-isohybrid: renamed variable hdd_dir

Browse Source 
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>
This commit is contained in:
Ed Bartosh
2017-01-27 16:39:14 +02:00
committed by Richard Purdie
parent 1239f625b1
commit d5b2539213
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+4 -4
View File
@@ -249,7 +249,7 @@ class IsoImagePlugin(SourcePlugin):
part.rootfs_dir = rootfs_dir part.rootfs_dir = rootfs_dir
# Prepare rootfs.img # Prepare rootfs.img
hdd_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") deploy_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
img_iso_dir = get_bitbake_var("ISODIR") img_iso_dir = get_bitbake_var("ISODIR")
rootfs_img = "%s/rootfs.img" % img_iso_dir rootfs_img = "%s/rootfs.img" % img_iso_dir
if not os.path.isfile(rootfs_img): if not os.path.isfile(rootfs_img):
@@ -282,12 +282,12 @@ class IsoImagePlugin(SourcePlugin):
# Support using a different initrd other than default # Support using a different initrd other than default
if source_params.get('initrd'): if source_params.get('initrd'):
initrd = source_params['initrd'] initrd = source_params['initrd']
if not hdd_dir: if not deploy_dir:
msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n")
cp_cmd = "cp %s/%s %s" % (hdd_dir, initrd, cr_workdir) cp_cmd = "cp %s/%s %s" % (deploy_dir, initrd, cr_workdir)
else: else:
# Prepare initial ramdisk # Prepare initial ramdisk
initrd = "%s/initrd" % hdd_dir initrd = "%s/initrd" % deploy_dir
if not os.path.isfile(initrd): if not os.path.isfile(initrd):
initrd = "%s/initrd" % img_iso_dir initrd = "%s/initrd" % img_iso_dir
if not os.path.isfile(initrd): if not os.path.isfile(initrd):