diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-27 16:39:14 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-31 14:13:29 +0000 |
| commit | fc84893c319f3e8c72f13c58f25e0b54095c3a49 (patch) | |
| tree | d6deadb49dfc4c683f83adc2167312211abf85fe /scripts | |
| parent | 1ac0a182bd21e38588fc5b168e7dfea01a6c4b26 (diff) | |
| download | openembedded-core-fc84893c319f3e8c72f13c58f25e0b54095c3a49.tar.gz openembedded-core-fc84893c319f3e8c72f13c58f25e0b54095c3a49.tar.bz2 openembedded-core-fc84893c319f3e8c72f13c58f25e0b54095c3a49.zip | |
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.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 8 |
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): 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): |