All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ed Bartosh <ed.bartosh@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH v3 11/11] isoimage-isohybrid: renamed variable hdd_dir
Date: Fri, 27 Jan 2017 22:19:48 +0200	[thread overview]
Message-ID: <507d4056d829958f0e5297df006981d4ce27b26d.1485547221.git.ed.bartosh@linux.intel.com> (raw)
In-Reply-To: <cover.1485547221.git.ed.bartosh@linux.intel.com>

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>
---
 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



  parent reply	other threads:[~2017-01-27 20:43 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-27 20:19 [PATCH v3 00/11] Fix for #10835 - WIC should not rely on hddimg creation for finding all needed artifacts Ed Bartosh
2017-01-27 20:19 ` [PATCH v3 01/11] image-wic: move wic code to image-wic.bbclass Ed Bartosh
2017-01-30 10:25   ` Ola x Nilsson
2017-01-30 17:03     ` Ed Bartosh
2017-01-30 17:27   ` Rick Altherr
2017-01-30 17:18     ` Ed Bartosh
2017-01-30 17:47       ` Rick Altherr
2017-01-30 17:45         ` Ed Bartosh
2017-01-30 18:25           ` Rick Altherr
2017-01-30 18:15             ` Ed Bartosh
2017-01-30 18:41               ` Rick Altherr
2017-01-30 18:42                 ` Ed Bartosh
2017-01-30 19:07                   ` Rick Altherr
2017-02-01 15:00                     ` Ed Bartosh
2017-02-01 16:48                       ` Rick Altherr
2017-01-27 20:19 ` [PATCH v3 02/11] wic: use INITRD_LIVE in isoimage-isohybrid Ed Bartosh
2017-01-27 20:19 ` [PATCH v3 03/11] wic: isoimage-isohybrid: stop using HDDDIR Ed Bartosh
2017-01-27 20:19 ` [PATCH v3 04/11] image-wic: remove HDDDIR from WICVARS Ed Bartosh
2017-01-27 20:19 ` [PATCH v3 05/11] wic: Look for image artifacts in a common location Ed Bartosh
2017-01-27 20:19 ` [PATCH v3 06/11] isoimage-isohybrid: use TRANSLATED_TARGET_ARCH instead of MACHINE_ARCH Ed Bartosh
2017-01-27 20:19 ` [PATCH v3 07/11] selftest: stop using hddimg in the wic test suite Ed Bartosh
2017-01-27 20:19 ` [PATCH v3 08/11] selftest: wic: fix test_iso_image test case Ed Bartosh
2017-01-27 20:19 ` [PATCH v3 09/11] grub-efi.bbclass: use 'grub-efi-' prefix Ed Bartosh
2017-01-27 20:19 ` [PATCH v3 10/11] wic-tools: add dependency to systemd-boot Ed Bartosh
2017-01-27 20:19 ` Ed Bartosh [this message]
2017-01-27 20:53 ` ✗ patchtest: failure for Fix for #10835 - WIC should not rely on hddimg creation for finding all needed artifacts (rev3) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=507d4056d829958f0e5297df006981d4ce27b26d.1485547221.git.ed.bartosh@linux.intel.com \
    --to=ed.bartosh@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.