From c4ea075d918124f556619e8e75b7ca38b3f2dac8 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 15 Nov 2018 14:30:15 -0800 Subject: poky: sumo refresh eebbc00b25..64a257fa22 Update poky to sumo HEAD. Armin Kuster (1): dhcp: allow for excluding the external bind Awais Belal (1): bitbake: bitbake: toaster: allow OE_ROOT to be provided through environment Changqing Li (2): unzip: fix for CVE-2018-18384 curl: fix for CVE-2018-16839/CVE-2018-16840/CVE-2018-16842 Fabien Lahoudere (1): archiver: Drop unwanted directories Ioan-Adrian Ratiu (1): wic: isoimage-isohybrid: fix UEFI spec breakage Kosta Zertsekel (1): meta: Use double colon for chown OWNER:GROUP Matthias Schiffer (1): base.bbclass: avoid 'find -ignore_readdir_race -delete' Mohamad Noor Alim Hussin (1): oeqa/selftest/recipetool: Fix problems from changing upstream source Peter Kjellerstedt (4): common-licenses: Correct the FreeType license text apr: Trim license info extracted from apr_lib.h apr-util: Trim license info extracted from apu_version.h pixman: Trim license info extracted from pixman-matrix.c Richard Purdie (4): oeqa/selftest/wic: Use a subdir of builddir, not /var/ oeqa/selftest/wic: Ensure initramfs exists for test_iso_image selftest/wic: Improve error message for test_fixed_size crosssdk: Remove usage of host flags for cross-compilation Ross Burton (3): unzip: actually apply CVE-2018-18384 curl: actually apply latest CVE patches gnupg: patch gnupg-native to allow path relocation Scott Rifenbark (1): kernel-dev: Updated phrasing for what a "defconfig" file is. Change-Id: I08f7fbe91f3f7ed6f00b6ea691c33ee1e0d3205b Signed-off-by: Brad Bishop --- poky/scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'poky/scripts/lib/wic') diff --git a/poky/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/poky/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index d6bd3bff7..b119c9c2f 100644 --- a/poky/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/poky/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -328,16 +328,18 @@ class IsoImagePlugin(SourcePlugin): raise WicError("Coludn't find target architecture") if re.match("x86_64", target_arch): - grub_image = "grub-efi-bootx64.efi" + grub_src_image = "grub-efi-bootx64.efi" + grub_dest_image = "bootx64.efi" elif re.match('i.86', target_arch): - grub_image = "grub-efi-bootia32.efi" + grub_src_image = "grub-efi-bootia32.efi" + grub_dest_image = "bootia32.efi" else: raise WicError("grub-efi is incompatible with target %s" % target_arch) - grub_target = os.path.join(target_dir, grub_image) + grub_target = os.path.join(target_dir, grub_dest_image) if not os.path.isfile(grub_target): - grub_src = os.path.join(deploy_dir, grub_image) + grub_src = os.path.join(deploy_dir, grub_src_image) if not os.path.exists(grub_src): raise WicError("Grub loader %s is not found in %s. " "Please build grub-efi first" % (grub_image, deploy_dir)) -- cgit v1.2.3