[OE-core] [PATCH] bootimg-efi.py: Use IMGDEPLOYDIR instead of DEPLOY_DIR_IMAGE for initrd

Alejandro Hernandez alejandro.hernandez at linux.intel.com
Fri Jun 30 17:53:30 UTC 2017


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




More information about the Openembedded-core mailing list