[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4187/8267] wic: fixed test_iso_image test case

[Emmanuele Bassi <ebassi src gnome org>]

commit 657f1e44b12cd91913b8bf3a6108bf1c62592b83
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Wed Jan 18 19:21:17 2017 +0200

    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>

 meta/lib/oeqa/selftest/wic.py                      |    4 ++++
 .../lib/wic/plugins/source/isoimage-isohybrid.py   |    5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 6a61ba6..14109c4 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -149,6 +149,10 @@ class Wic(oeSelfTest):
     @testcase(1346)
     def test_iso_image(self):
         """Test creation of hybrid iso image with legacy and EFI boot"""
+        config = 'IMAGE_FSTYPES += " hddimg "\nMACHINE_FEATURES_append = " efi"\n'
+        self.append_config(config)
+        bitbake('core-image-minimal')
+        self.remove_config(config)
         cmd = "wic create mkhybridiso --image-name core-image-minimal"
         self.assertEqual(0, runCmd(cmd).status)
         self.assertEqual(1, len(glob(self.resultdir + "HYBRID_ISO_IMG-*.direct")))
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py 
b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index 15fd858..a8a5dc0 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' "