openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File 42.patch of Package fwupd-efi2 (Revision 89f279a82690c455dffe60a55b397867)

Currently displaying revision 89f279a82690c455dffe60a55b397867 , Show latest

From 0a39a0b73c53eab05edc4b5bc6a282354313821f Mon Sep 17 00:00:00 2001
From: Mario Limonciello <superm1@gmail.com>
Date: Mon, 20 Mar 2023 13:28:35 -0500
Subject: [PATCH 1/2] trivial: fall back to /usr/lib if the multi os path
 doesn't exist

---
 efi/meson.build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/efi/meson.build b/efi/meson.build
index 979936d..2eda5a9 100644
--- a/efi/meson.build
+++ b/efi/meson.build
@@ -37,8 +37,12 @@ endif
 
 efi_libdir = get_option('efi-libdir')
 if efi_libdir == ''
+  fs = import('fs')
   multi = run_command(cc.cmd_array(), '-print-multi-os-directory').stdout().strip()
   efi_libdir = join_paths('/usr/lib/', multi)
+  if not fs.is_dir(join_paths(efi_libdir, 'gnuefi'))
+    efi_libdir = '/usr/lib'
+  endif
 endif
 
 have_gnu_efi = gnu_efi_path_arch != '' and efi_libdir != ''

From 1796d25cf84862aa4de8c3dd58da2619c62fe5c7 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <superm1@gmail.com>
Date: Mon, 20 Mar 2023 13:44:20 -0500
Subject: [PATCH 2/2] trivial: use correct path for local lds when gnu-efi is
 missing SBAT

---
 efi/meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/efi/meson.build b/efi/meson.build
index 2eda5a9..1931855 100644
--- a/efi/meson.build
+++ b/efi/meson.build
@@ -112,6 +112,7 @@ if get_option('efi_sbat_distro_id') != ''
   if cmd.returncode() != 0
     warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_ldsdir, arch_lds)))
     efi_ldsdir = join_paths(meson.current_source_dir(), 'lds')
+    arch_lds = 'elf_@0@@1@_efi.lds'.format(gnu_efi_arch, lds_os)
   endif
 endif

Places

File 42.patch of Package fwupd-efi2 (Revision 89f279a82690c455dffe60a55b397867)

Places