mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
wic: isoimage-isohybrid: use grub-efi from deploy dir
isoimage-isohybrid plugin tries to build grub-efi in its working directory if it can't find efi binary. Wic should avoid doing anything in working directories of other recipes. It should use artifacts from the image deployment directory instead. (From OE-Core rev: 9a1709278de877085a8d92f6361624e279a603bf) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
Richard Purdie
parent
393e55c1ff
commit
c23be1034b
|
|
@ -95,7 +95,7 @@ class IsoImagePlugin(SourcePlugin):
|
|||
cfg.write(syslinux_conf)
|
||||
|
||||
@classmethod
|
||||
def do_configure_grubefi(cls, part, creator, cr_workdir):
|
||||
def do_configure_grubefi(cls, part, creator, target_dir):
|
||||
"""
|
||||
Create loader-specific (grub-efi) config
|
||||
"""
|
||||
|
|
@ -109,7 +109,7 @@ class IsoImagePlugin(SourcePlugin):
|
|||
raise WicError("configfile is specified "
|
||||
"but failed to get it from %s", configfile)
|
||||
else:
|
||||
splash = os.path.join(cr_workdir, "EFI/boot/splash.jpg")
|
||||
splash = os.path.join(target_dir, "splash.jpg")
|
||||
if os.path.exists(splash):
|
||||
splashline = "menu background splash.jpg"
|
||||
else:
|
||||
|
|
@ -137,9 +137,10 @@ class IsoImagePlugin(SourcePlugin):
|
|||
if splashline:
|
||||
grubefi_conf += "%s\n" % splashline
|
||||
|
||||
logger.debug("Writing grubefi config %s/EFI/BOOT/grub.cfg", cr_workdir)
|
||||
cfg_path = os.path.join(target_dir, "grub.cfg")
|
||||
logger.debug("Writing grubefi config %s", cfg_path)
|
||||
|
||||
with open("%s/EFI/BOOT/grub.cfg" % cr_workdir, "w") as cfg:
|
||||
with open(cfg_path, "w") as cfg:
|
||||
cfg.write(grubefi_conf)
|
||||
|
||||
@staticmethod
|
||||
|
|
@ -313,20 +314,13 @@ class IsoImagePlugin(SourcePlugin):
|
|||
|
||||
#Create bootloader for efi boot
|
||||
try:
|
||||
target_dir = "%s/EFI/BOOT" % isodir
|
||||
if os.path.exists(target_dir):
|
||||
shutil.rmtree(target_dir)
|
||||
|
||||
os.makedirs(target_dir)
|
||||
|
||||
if source_params['loader'] == 'grub-efi':
|
||||
# Builds grub.cfg if ISODIR didn't exist or
|
||||
# didn't contains grub.cfg
|
||||
bootimg_dir = img_iso_dir
|
||||
if not os.path.exists("%s/EFI/BOOT" % bootimg_dir):
|
||||
bootimg_dir = "%s/bootimg" % cr_workdir
|
||||
if os.path.exists(bootimg_dir):
|
||||
shutil.rmtree(bootimg_dir)
|
||||
install_cmd = "install -d %s/EFI/BOOT" % bootimg_dir
|
||||
exec_cmd(install_cmd)
|
||||
|
||||
if not os.path.isfile("%s/EFI/BOOT/boot.cfg" % bootimg_dir):
|
||||
cls.do_configure_grubefi(part, creator, bootimg_dir)
|
||||
|
||||
# Builds bootx64.efi/bootia32.efi if ISODIR didn't exist or
|
||||
# didn't contains it
|
||||
target_arch = get_bitbake_var("TARGET_SYS")
|
||||
|
|
@ -334,37 +328,23 @@ class IsoImagePlugin(SourcePlugin):
|
|||
raise WicError("Coludn't find target architecture")
|
||||
|
||||
if re.match("x86_64", target_arch):
|
||||
grub_target = 'x86_64-efi'
|
||||
grub_image = "bootx64.efi"
|
||||
grub_image = "grub-efi-bootx64.efi"
|
||||
elif re.match('i.86', target_arch):
|
||||
grub_target = 'i386-efi'
|
||||
grub_image = "bootia32.efi"
|
||||
grub_image = "grub-efi-bootia32.efi"
|
||||
else:
|
||||
raise WicError("grub-efi is incompatible with target %s" %
|
||||
target_arch)
|
||||
|
||||
if not os.path.isfile("%s/EFI/BOOT/%s" \
|
||||
% (bootimg_dir, grub_image)):
|
||||
grub_path = get_bitbake_var("STAGING_LIBDIR")
|
||||
if not grub_path:
|
||||
raise WicError("Couldn't find STAGING_LIBDIR, exiting.")
|
||||
grub_target = os.path.join(target_dir, grub_image)
|
||||
if not os.path.isfile(grub_target):
|
||||
grub_src = os.path.join(deploy_dir, grub_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))
|
||||
shutil.copy(grub_src, grub_target)
|
||||
|
||||
grub_core = "%s/grub/%s" % (grub_path, grub_target)
|
||||
if not os.path.exists(grub_core):
|
||||
raise WicError("Please build grub-efi first")
|
||||
|
||||
grub_cmd = "grub-mkimage -p '/EFI/BOOT' "
|
||||
grub_cmd += "-d %s " % grub_core
|
||||
grub_cmd += "-O %s -o %s/EFI/BOOT/%s " \
|
||||
% (grub_target, bootimg_dir, grub_image)
|
||||
grub_cmd += "part_gpt part_msdos ntfs ntfscomp fat ext2 "
|
||||
grub_cmd += "normal chain boot configfile linux multiboot "
|
||||
grub_cmd += "search efi_gop efi_uga font gfxterm gfxmenu "
|
||||
grub_cmd += "terminal minicmd test iorw loadenv echo help "
|
||||
grub_cmd += "reboot serial terminfo iso9660 loopback tar "
|
||||
grub_cmd += "memdisk ls search_fs_uuid udf btrfs xfs lvm "
|
||||
grub_cmd += "reiserfs ata "
|
||||
exec_native_cmd(grub_cmd, native_sysroot)
|
||||
if not os.path.isfile(os.path.join(target_dir, "boot.cfg")):
|
||||
cls.do_configure_grubefi(part, creator, target_dir)
|
||||
|
||||
else:
|
||||
raise WicError("unrecognized bootimg-efi loader: %s" %
|
||||
|
|
@ -372,15 +352,6 @@ class IsoImagePlugin(SourcePlugin):
|
|||
except KeyError:
|
||||
raise WicError("bootimg-efi requires a loader, none specified")
|
||||
|
||||
if os.path.exists("%s/EFI/BOOT" % isodir):
|
||||
shutil.rmtree("%s/EFI/BOOT" % isodir)
|
||||
|
||||
shutil.copytree(bootimg_dir+"/EFI/BOOT", isodir+"/EFI/BOOT")
|
||||
|
||||
# If exists, remove cr_workdir/bootimg temporary folder
|
||||
if os.path.exists("%s/bootimg" % cr_workdir):
|
||||
shutil.rmtree("%s/bootimg" % cr_workdir)
|
||||
|
||||
# Create efi.img that contains bootloader files for EFI booting
|
||||
# if ISODIR didn't exist or didn't contains it
|
||||
if os.path.isfile("%s/efi.img" % img_iso_dir):
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user