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

(From OE-Core rev: 5878484da64c38c7fde45bb06d76e22e608eb022)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2017-01-18 19:21:17 +02:00
committed by Richard Purdie
parent 349dbad11d
commit 657f1e44b1
2 changed files with 5 additions and 4 deletions

View File

@@ -336,14 +336,11 @@ 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")