Skip to content

Commit dca45d8

Browse files
committed
grub: remove unneeded lockdown and shim_lock patch
Disabling inside lockdown and shim_lock verifieirs with patch is unneeded, as there is already a `--disable-shim-lock`[1] option, which should be used instead. [1] https://www.gnu.org/software/grub/manual/grub/html_node/UEFI-secure-boot-and-shim.html Signed-off-by: Piotr Łobacz <[email protected]>
1 parent 7a51f09 commit dca45d8

File tree

4 files changed

+3
-50
lines changed

4 files changed

+3
-50
lines changed

meta-efi-secure-boot/recipes-bsp/grub/grub-efi-efi-secure-boot.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ GRUB_MOKVERIFY_PATCH = " \
1212
file://0004-support-mok2-verify-in-multiboot2-protocol.patch \
1313
file://0005-Verify-all-buffiles.patch \
1414
file://0006-grub-efi-support-passing-a-buffer-to-be-verified.patch \
15-
file://0007-kern-efi-init.c-disable-inside-lockdown-and-shim_loc.patch \
16-
file://0008-efi-fallback-to-legacy-mode-if-mok2verify-is-loaded.patch \
17-
file://0009-mok2verify-remove-unused-parameter-from-grub_efi_mok.patch \
15+
file://0007-efi-fallback-to-legacy-mode-if-mok2verify-is-loaded.patch \
16+
file://0008-mok2verify-remove-unused-parameter-from-grub_efi_mok.patch \
1817
"
1918

2019
SRC_URI:append:class-target = " \
@@ -49,6 +48,7 @@ GRUB_SECURE_BUILDIN:append:class-target = " \
4948
${GRUB_SELOADER_MODULES} \
5049
${GRUB_TPM_MODULES} \
5150
--sbat ${WORKDIR}/sbat.csv \
51+
${@'--disable-shim-lock' if d.getVar('UEFI_SELOADER') == '1' else ''} \
5252
"
5353

5454
# Set a default root specifier.

meta-efi-secure-boot/recipes-bsp/grub/grub-efi/0008-efi-fallback-to-legacy-mode-if-mok2verify-is-loaded.patch renamed to meta-efi-secure-boot/recipes-bsp/grub/grub-efi/0007-efi-fallback-to-legacy-mode-if-mok2verify-is-loaded.patch

File renamed without changes.

meta-efi-secure-boot/recipes-bsp/grub/grub-efi/0007-kern-efi-init.c-disable-inside-lockdown-and-shim_loc.patch

Lines changed: 0 additions & 47 deletions
This file was deleted.

meta-efi-secure-boot/recipes-bsp/grub/grub-efi/0009-mok2verify-remove-unused-parameter-from-grub_efi_mok.patch renamed to meta-efi-secure-boot/recipes-bsp/grub/grub-efi/0008-mok2verify-remove-unused-parameter-from-grub_efi_mok.patch

File renamed without changes.

0 commit comments

Comments
 (0)