Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2021-03-05 13:45:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Fri Mar 5 13:45:52 2021 rev:235 rq:876987 version:2.04
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2021-03-03
18:33:41.319326009 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.2378/grub2.changes 2021-03-05
13:47:06.751722342 +0100
@@ -1,0 +2,6 @@
+Fri Mar 5 09:41:07 UTC 2021 - Michael Chang <mch...@suse.com>
+
+- Fix chainloading windows on dual boot machine (bsc#1183073)
+ * 0001-Add-chainloaded-image-as-shim-s-verifiable-object.patch
+
+-------------------------------------------------------------------
New:
----
0001-Add-chainloaded-image-as-shim-s-verifiable-object.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.oyImfa/_old 2021-03-05 13:47:09.079724458 +0100
+++ /var/tmp/diff_new_pack.oyImfa/_new 2021-03-05 13:47:09.079724458 +0100
@@ -390,6 +390,7 @@
Patch784: 0044-squash-kern-Add-lockdown-support.patch
Patch785: 0045-squash-Add-support-for-Linux-EFI-stub-loading-on-aar.patch
Patch786: 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
+Patch787: 0001-Add-chainloaded-image-as-shim-s-verifiable-object.patch
Requires: gettext-runtime
%if 0%{?suse_version} >= 1140
@@ -769,6 +770,7 @@
%patch784 -p1
%patch785 -p1
%patch786 -p1
+%patch787 -p1
%build
# collect evidence to debug spurious build failure on SLE15
++++++ 0001-Add-chainloaded-image-as-shim-s-verifiable-object.patch ++++++
>From eaed36ac87c3f8edeea67bf333700819e80ac732 Mon Sep 17 00:00:00 2001
From: Michael Chang <mch...@suse.com>
Date: Fri, 5 Mar 2021 17:33:17 +0800
Subject: [PATCH] Add chainloaded image as shim's verifiable object
This fixed error in dual booting Microsoft Windows
error ../../grub-core/kern/verifiers.c:119:verification requested but
nobody cares: /EFI/Microsoft/Boot/bootmgfw.efi.
---
grub-core/kern/efi/sb.c | 1 +
grub-core/kern/lockdown.c | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c
index 41dadcd14..96d237722 100644
--- a/grub-core/kern/efi/sb.c
+++ b/grub-core/kern/efi/sb.c
@@ -129,6 +129,7 @@ shim_lock_verifier_init (grub_file_t io __attribute__
((unused)),
case GRUB_FILE_TYPE_BSD_KERNEL:
case GRUB_FILE_TYPE_XNU_KERNEL:
case GRUB_FILE_TYPE_PLAN9_KERNEL:
+ case GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE:
*flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK;
/* Fall through. */
diff --git a/grub-core/kern/lockdown.c b/grub-core/kern/lockdown.c
index 0bc70fd42..e1fd1c1e2 100644
--- a/grub-core/kern/lockdown.c
+++ b/grub-core/kern/lockdown.c
@@ -48,7 +48,6 @@ lockdown_verifier_init (grub_file_t io __attribute__
((unused)),
case GRUB_FILE_TYPE_PXECHAINLOADER:
case GRUB_FILE_TYPE_PCCHAINLOADER:
case GRUB_FILE_TYPE_COREBOOT_CHAINLOADER:
- case GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE:
case GRUB_FILE_TYPE_ACPI_TABLE:
case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE:
*flags = GRUB_VERIFY_FLAGS_DEFER_AUTH;
--
2.26.2
