Accepting request 879207 from Base:System

OBS-URL: https://build.opensuse.org/request/show/879207
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fwupd?expand=0&rev=41

fwupd-bsc1182057-fix-sbat-section-copy.patch

@@ -0,0 +1,34 @@
+From b283395049be8071d3699dfa3a411a3b37406f0b Mon Sep 17 00:00:00 2001
+From: Gary Lin <glin@suse.com>
+Date: Tue, 9 Mar 2021 15:26:20 +0800
+Subject: [PATCH] uefi-capsule: Specify the section flags for .sbat
+
+When using "objcopy -O binary" to generate AArch64 EFI images, it
+silently drops the sections without "alloc" or "load" or the sections
+with "unload", and this caused the content of .sbat was skipped in the
+final EFI image.
+
+This commit sets the common read-only data section flags to .sbat to
+make sure the content will be copied.
+
+Signed-off-by: Gary Lin <glin@suse.com>
+---
+ plugins/uefi-capsule/efi/generate_sbat.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/uefi-capsule/efi/generate_sbat.py b/plugins/uefi-capsule/efi/generate_sbat.py
+index 227bc841..18f7c4c7 100755
+--- a/plugins/uefi-capsule/efi/generate_sbat.py
++++ b/plugins/uefi-capsule/efi/generate_sbat.py
+@@ -70,6 +70,8 @@ def _generate_sbat(args):
+             args.objcopy,
+             "--add-section",
+             ".sbat={}".format(sfd.name),
++            "--set-section-flags",
++            ".sbat=contents,alloc,load,readonly,data",
+             args.outfile,
+         ]
+         subprocess.run(argv, check=True)
+-- 
+2.29.2
+

fwupd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 12 08:30:32 UTC 2021 - Gary Ching-Pang Lin <glin@suse.com>
+
+- Add fwupd-bsc1182057-fix-sbat-section-copy.patch to set the
+  proper section flags for .sbat section so that objcopy can
+  copy it into fwupd*.efi (bsc#1182057)
+
 -------------------------------------------------------------------
 Wed Feb 24 01:50:12 UTC 2021 - Gary Ching-Pang Lin <glin@suse.com>
 

fwupd.spec

@@ -44,6 +44,8 @@ Source:         %{name}-%{version}.tar.xz
 Patch1:         fwupd-bsc1130056-change-shim-path.patch
 # PATCH-FIX-OPENSUSE fwupd-jscSLE-11766-close-efidir-leap-gap.patch jsc#SLE-11766 qkzhu@suse.com -- Set SLE and openSUSE esp os dir at runtime
 Patch2:         fwupd-jscSLE-11766-close-efidir-leap-gap.patch
+# PATCH-FIX-UPSTRAEM fwupd-bsc1182057-fix-sbat-section-copy.patch bsc#1182057 glin@suse.com -- Set the proper section flags for .sbat
+Patch3:         fwupd-bsc1182057-fix-sbat-section-copy.patch
 
 BuildRequires:  dejavu-fonts
 %if %{with fish_support}