mirrors/meta-secure-core
1
0
Fork 0
mirror of https://github.com/jiazhang0/meta-secure-core.git synced 2026-07-16 12:47:00 +00:00
Code Issues Projects Releases Wiki Activity

Grub: Parameterize prefix dir

Browse Source
This commit is contained in:
Jussi Keranen
2021-01-21 17:03:36 +02:00
committed by Jia Zhang
parent d05fc08f90
commit d72746bfa7
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-efi-secure-boot/recipes-bsp/grub/grub-efi-efi-secure-boot.inc
+6 -5
View File
@@ -36,6 +36,7 @@ SRC_URI += "\
# functions efi_call_foo and efi_shim_exit are not implemented for arm64 yet # functions efi_call_foo and efi_shim_exit are not implemented for arm64 yet
COMPATIBLE_HOST_aarch64 = 'null' COMPATIBLE_HOST_aarch64 = 'null'
GRUB_PREFIX_DIR ?= "/EFI/BOOT"
EFI_BOOT_PATH ?= "/boot/efi/EFI/BOOT" EFI_BOOT_PATH ?= "/boot/efi/EFI/BOOT"
GRUB_SECURE_BOOT_MODULES += "${@'efivar password_pbkdf2 ' if d.getVar('UEFI_SB', True) == '1' else ''}" GRUB_SECURE_BOOT_MODULES += "${@'efivar password_pbkdf2 ' if d.getVar('UEFI_SB', True) == '1' else ''}"
@@ -81,13 +82,13 @@ do_compile_append() {
cat<<EOF>${WORKDIR}/cfg cat<<EOF>${WORKDIR}/cfg
insmod verify insmod verify
set strict_security=1 set strict_security=1
search.file (\$cmdpath)/EFI/BOOT/grub.cfg root search.file (\$cmdpath)${GRUB_PREFIX_DIR}/grub.cfg root
set prefix=(\$root)/EFI/BOOT set prefix=(\$root)${GRUB_PREFIX_DIR}
EOF EOF
else else
cat<<EOF>${WORKDIR}/cfg cat<<EOF>${WORKDIR}/cfg
search.file (\$cmdpath)/EFI/BOOT/grub.cfg root search.file (\$cmdpath)${GRUB_PREFIX_DIR}/grub.cfg root
set prefix=(\$root)/EFI/BOOT set prefix=(\$root)${GRUB_PREFIX_DIR}
EOF EOF
fi fi
} }
@@ -130,7 +131,7 @@ do_install_append_class-target() {
grub-editenv "${D}${EFI_BOOT_PATH}/grubenv" create grub-editenv "${D}${EFI_BOOT_PATH}/grubenv" create
install -d "${D}${EFI_BOOT_PATH}/${GRUB_TARGET}-efi" 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}" \ -O "${GRUB_TARGET}-efi" -o "${B}/${GRUB_IMAGE}" \
${GRUB_BUILDIN} ${GRUB_BUILDIN}