diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-18 19:21:17 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-23 12:03:51 +0000 |
| commit | 5878484da64c38c7fde45bb06d76e22e608eb022 (patch) | |
| tree | 209b9871f42ee49af439a9bbcaab586a66fc40a3 | |
| parent | cd0e7b20de2de67793d0454f4e5cf6bb6f4a16f7 (diff) | |
| download | openembedded-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>
| -rw-r--r-- | meta/lib/oeqa/selftest/wic.py | 4 | ||||
| -rw-r--r-- | scripts/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 6a61ba6868..14109c4b5a 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 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' " |