From d72746bfa7b2466fe16fb636314ec0cee319f6d4 Mon Sep 17 00:00:00 2001 From: Jussi Keranen Date: Thu, 21 Jan 2021 17:03:36 +0200 Subject: Grub: Parameterize prefix dir --- .../recipes-bsp/grub/grub-efi-efi-secure-boot.inc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta-efi-secure-boot/recipes-bsp/grub/grub-efi-efi-secure-boot.inc b/meta-efi-secure-boot/recipes-bsp/grub/grub-efi-efi-secure-boot.inc index 6feee6c..88818ea 100644 --- a/meta-efi-secure-boot/recipes-bsp/grub/grub-efi-efi-secure-boot.inc +++ b/meta-efi-secure-boot/recipes-bsp/grub/grub-efi-efi-secure-boot.inc @@ -36,6 +36,7 @@ SRC_URI += "\ # functions efi_call_foo and efi_shim_exit are not implemented for arm64 yet COMPATIBLE_HOST_aarch64 = 'null' +GRUB_PREFIX_DIR ?= "/EFI/BOOT" EFI_BOOT_PATH ?= "/boot/efi/EFI/BOOT" GRUB_SECURE_BOOT_MODULES += "${@'efivar password_pbkdf2 ' if d.getVar('UEFI_SB', True) == '1' else ''}" @@ -81,13 +82,13 @@ do_compile_append() { cat<${WORKDIR}/cfg insmod verify set strict_security=1 -search.file (\$cmdpath)/EFI/BOOT/grub.cfg root -set prefix=(\$root)/EFI/BOOT +search.file (\$cmdpath)${GRUB_PREFIX_DIR}/grub.cfg root +set prefix=(\$root)${GRUB_PREFIX_DIR} EOF else cat<${WORKDIR}/cfg -search.file (\$cmdpath)/EFI/BOOT/grub.cfg root -set prefix=(\$root)/EFI/BOOT +search.file (\$cmdpath)${GRUB_PREFIX_DIR}/grub.cfg root +set prefix=(\$root)${GRUB_PREFIX_DIR} EOF fi } @@ -130,7 +131,7 @@ do_install_append_class-target() { grub-editenv "${D}${EFI_BOOT_PATH}/grubenv" create install -d "${D}${EFI_BOOT_PATH}/${GRUB_TARGET}-efi" - grub-mkimage -c ../cfg -p /EFI/BOOT -d "./grub-core" \ + grub-mkimage -c ../cfg -p "${GRUB_PREFIX_DIR}" -d "./grub-core" \ -O "${GRUB_TARGET}-efi" -o "${B}/${GRUB_IMAGE}" \ ${GRUB_BUILDIN} -- cgit v1.2.3-54-g00ecf