summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-18 19:21:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-23 12:03:51 +0000
commit5878484da64c38c7fde45bb06d76e22e608eb022 (patch)
tree209b9871f42ee49af439a9bbcaab586a66fc40a3 /scripts
parentcd0e7b20de2de67793d0454f4e5cf6bb6f4a16f7 (diff)
downloadopenembedded-core-5878484da64c38c7fde45bb06d76e22e608eb022.tar.gz
openembedded-core-5878484da64c38c7fde45bb06d76e22e608eb022.tar.bz2
openembedded-core-5878484da64c38c7fde45bb06d76e22e608eb022.zip
wic: fixed test_iso_image test case
Fixed isoimage-isohybrid plulgin and correspondent wic tet case: - used wic-tools target when getting varlue of STAGING_LIBDIR variable - ensured that image is built with efi and hddimg enabled Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index 15fd858d22..a8a5dc0a59 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -336,15 +336,12 @@ class IsoImagePlugin(SourcePlugin):
if not os.path.isfile("%s/EFI/BOOT/%s" \
% (bootimg_dir, grub_image)):
- grub_path = get_bitbake_var("STAGING_LIBDIR")
+ grub_path = get_bitbake_var("STAGING_LIBDIR", "wic-tools")
if not grub_path:
msger.error("Couldn't find STAGING_LIBDIR, exiting.\n")
grub_core = "%s/grub/%s" % (grub_path, grub_target)
if not os.path.exists(grub_core):
- msger.info("Building grub-efi...\n")
- exec_cmd("bitbake grub-efi")
- if not os.path.exists(grub_core):
msger.error("Please build grub-efi first\n")
grub_cmd = "grub-mkimage -p '/EFI/BOOT' "