From: Jan Janssen <medhefgo@web.de>
Date: Wed, 26 Jan 2022 23:35:36 +0000 (+0000)
Subject: boot: Build BCD parser only on arches supported by Windows
X-Git-Tag: archive/raspbian/250.3-2+rpi1^2~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a881063653256c801eb09e6448ce05df644a5861;p=systemd.git

boot: Build BCD parser only on arches supported by Windows

Origin: https://github.com/systemd/systemd/commit/77fcf28cb88b302453b4c991a6571cb37f10634d


Gbp-Pq: Name boot-Build-BCD-parser-only-on-arches-supported-by-Wi.patch
---

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index 0286914b..83358406 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -1941,6 +1941,7 @@ static void config_entry_add_osx(Config *config) {
 }
 
 static void config_entry_add_windows(Config *config, EFI_HANDLE *device, EFI_FILE *root_dir) {
+#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
         _cleanup_freepool_ CHAR8 *bcd = NULL;
         CHAR16 *title = NULL;
         EFI_STATUS err;
@@ -1961,6 +1962,7 @@ static void config_entry_add_windows(Config *config, EFI_HANDLE *device, EFI_FIL
         config_entry_add_loader_auto(config, device, root_dir, NULL,
                                      L"auto-windows", 'w', title ?: L"Windows Boot Manager",
                                      L"\\EFI\\Microsoft\\Boot\\bootmgfw.efi");
+#endif
 }
 
 static void config_entry_add_linux(
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index 1125c64e..f98dbf68 100644
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -310,7 +310,6 @@ common_sources = [
         'util.c']
 
 systemd_boot_sources = [
-        'bcd.c',
         'boot.c',
         'console.c',
         'drivers.c',
@@ -330,6 +329,18 @@ else
         stub_sources += 'linux.c'
 endif
 
+# BCD parser only makes sense on arches that Windows supports.
+if efi_arch[1] in ['ia32', 'x86_64', 'arm', 'aarch64']
+        systemd_boot_sources += 'bcd.c'
+        tests += [
+                [['src/boot/efi/test-bcd.c'],
+                 [],
+                 [libzstd],
+                 [],
+                 'HAVE_ZSTD'],
+        ]
+endif
+
 systemd_boot_objects = []
 stub_objects = []
 foreach file : fundamental_source_paths + common_sources + systemd_boot_sources + stub_sources
@@ -387,14 +398,6 @@ endforeach
 
 ############################################################
 
-tests += [
-        [['src/boot/efi/test-bcd.c'],
-         [],
-         [libzstd],
-         [],
-         'HAVE_ZSTD'],
-]
-
 test_efi_disk_img = custom_target(
         'test-efi-disk.img',
         input : [efi_stubs[0][0], efi_stubs[1][1]],