[oe-commits] [openembedded-core] 14/20: isoimage-isohybrid: Fix variable names

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 9bafeea8b1c5a4f67061cf4b389a81c4f4bf6cbb
Author: Alexandru Vasiu <alexandru.vasiu at ni.com>
AuthorDate: Mon Aug 27 17:31:04 2018 +0300

    isoimage-isohybrid: Fix variable names
    
    initrd.cpio is created in initrd_dir, not in cr_workdir. Gzip will
    let initrd.cpio uncompressed if the path is not found.
    
    Also, grub_image variable doesn't exist, grub_src_image should
    be used instead.
    
    Signed-off-by: Alexandru Vasiu <alexandru.vasiu at ni.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index 4a0a57e..25a695d 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -194,7 +194,7 @@ class IsoImagePlugin(SourcePlugin):
             exec_cmd("cd %s && find . | cpio -o -H newc -R root:root >./initrd.cpio " \
                     % initrd_dir, as_shell=True)
             exec_cmd("gzip -f -9 -c %s/initrd.cpio > %s" \
-                    % (cr_workdir, initrd), as_shell=True)
+                    % (initrd_dir, initrd), as_shell=True)
             shutil.rmtree(initrd_dir)
 
         return initrd
@@ -317,7 +317,7 @@ class IsoImagePlugin(SourcePlugin):
                     grub_src = os.path.join(deploy_dir, grub_src_image)
                     if not os.path.exists(grub_src):
                         raise WicError("Grub loader %s is not found in %s. "
-                                       "Please build grub-efi first" % (grub_image, deploy_dir))
+                                       "Please build grub-efi first" % (grub_src_image, deploy_dir))
                     shutil.copy(grub_src, grub_target)
 
                 if not os.path.isfile(os.path.join(target_dir, "boot.cfg")):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.