summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Vasiu <alexandru.vasiu@ni.com>2018-08-27 17:31:04 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-29 10:40:08 +0100
commitc88875b568a66297b1d3df380c590f20796c57f6 (patch)
treeb7bccccf89d8922463a6e465bc6d3ff72c1a602b
parent7c6ba368006ca94ecc0daac7b1c5e0fbe4236daf (diff)
downloadopenembedded-core-contrib-c88875b568a66297b1d3df380c590f20796c57f6.tar.gz
openembedded-core-contrib-c88875b568a66297b1d3df380c590f20796c57f6.tar.bz2
openembedded-core-contrib-c88875b568a66297b1d3df380c590f20796c57f6.zip
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@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py4
1 files 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 4a0a57ef9e..25a695da17 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")):