Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] bootimg-efi.py: Use IMGDEPLOYDIR instead of DEPLOY_DIR_IMAGE for initrd
Date: Fri, 30 Jun 2017 10:53:30 -0700	[thread overview]
Message-ID: <20170630175330.33908-1-alejandro.hernandez@linux.intel.com> (raw)

When using wic to create an image from a certain build, wic is expecting
to find initrd at the final destination of our images (DEPLOY_DIR_IMAGE),
which is wrong, since the initrd file has not been copied to the final
directory yet, so instead of trying to use an initrd file from 
DEPLOY_DIR_IMAGE we get it from IMGDEPLOYDIR, which is the directory 
where the resulting images are placed before their final destination, 
and its where we can find the correct initrd file for our image.

Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
---
 scripts/lib/wic/plugins/source/bootimg-efi.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 9879cb9fceb..d1d445ecfe1 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -105,9 +105,9 @@ class BootimgEFIPlugin(SourcePlugin):
 
         if initrd:
             # obviously we need to have a common common deploy var
-            bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
+            bootimg_dir = get_bitbake_var("IMGDEPLOYDIR")
             if not bootimg_dir:
-                raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting")
+                raise WicError("Couldn't find IMGDEPLOYDIR, exiting")
 
             cp_cmd = "cp %s/%s %s" % (bootimg_dir, initrd, hdddir)
             exec_cmd(cp_cmd, True)
-- 
2.12.0



             reply	other threads:[~2017-06-30 17:53 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-30 17:53 Alejandro Hernandez [this message]
2017-06-30 18:43 ` [PATCH] bootimg-efi.py: Use IMGDEPLOYDIR instead of DEPLOY_DIR_IMAGE for initrd Patrick Ohly
2017-06-30 20:38   ` Alejandro Hernandez
2017-07-01 15:09     ` Patrick Ohly
2017-07-01 21:48       ` Alejandro Hernandez
2017-07-03  6:45         ` Patrick Ohly
2017-07-03  9:06         ` Ed Bartosh
2017-07-03  8:36 ` Ed Bartosh
2017-07-03  9:27   ` Patrick Ohly
2017-07-03 12:44     ` Ed Bartosh
2017-07-03 14:10       ` Patrick Ohly

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=20170630175330.33908-1-alejandro.hernandez@linux.intel.com \
    --to=alejandro.hernandez@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox