From 5878484da64c38c7fde45bb06d76e22e608eb022 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 18 Jan 2017 19:21:17 +0200 Subject: 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 --- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'scripts/lib/wic/plugins/source') 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,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") -- cgit v1.2.3