[OE-core] [PATCH v3 11/11] isoimage-isohybrid: renamed variable hdd_dir
Ed Bartosh
ed.bartosh at linux.intel.com
Fri Jan 27 20:19:48 UTC 2017
Renamed variable hdd_dir to deploy_dir as this variable is
assigned to the value of DEPLOY_DIR_IMAGE.
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 8 ++++----
1 file 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 e4637a3..bceaa84 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):
part.rootfs_dir = rootfs_dir
# 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")
rootfs_img = "%s/rootfs.img" % img_iso_dir
if not os.path.isfile(rootfs_img):
@@ -282,12 +282,12 @@ class IsoImagePlugin(SourcePlugin):
# Support using a different initrd other than default
if source_params.get('initrd'):
initrd = source_params['initrd']
- if not hdd_dir:
+ if not deploy_dir:
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:
# Prepare initial ramdisk
- initrd = "%s/initrd" % hdd_dir
+ initrd = "%s/initrd" % deploy_dir
if not os.path.isfile(initrd):
initrd = "%s/initrd" % img_iso_dir
if not os.path.isfile(initrd):
--
2.1.4
More information about the Openembedded-core
mailing list