systemd-252-46

Resolves: RHEL-56019

1042-ukify-Skip-test-on-architectures-without-UEFI.patch

@@ -0,0 +1,30 @@
+From c16e8cd675313ceaf557465334b5e6c80ac1aa48 Mon Sep 17 00:00:00 2001
+From: Daan De Meyer <daan.j.demeyer@gmail.com>
+Date: Wed, 28 Aug 2024 14:08:30 +0200
+Subject: [PATCH] ukify: Skip test on architectures without UEFI
+
+(cherry picked from commit 5121f7c45b37afca53c89f42123b1dd6a04fa80f)
+
+Related: RHEL-56019
+---
+ src/ukify/test/test_ukify.py | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/ukify/test/test_ukify.py b/src/ukify/test/test_ukify.py
+index f233e25cf7..d6a9350398 100755
+--- a/src/ukify/test/test_ukify.py
++++ b/src/ukify/test/test_ukify.py
+@@ -35,6 +35,13 @@ except ImportError as e:
+ sys.path.append(os.path.dirname(__file__) + '/..')
+ import ukify
+ 
++# Skip if we're running on an architecture that does not use UEFI.
++try:
++    ukify.guess_efi_arch()
++except ValueError as e:
++    print(str(e), file=sys.stderr)
++    sys.exit(77)
++
+ build_root = os.getenv('PROJECT_BUILD_ROOT')
+ arg_tools = ['--tools', build_root] if build_root else []
+ 

systemd.spec

@@ -25,7 +25,7 @@
 Name:           systemd
 Url:            https://systemd.io
 Version:        252
-Release:        45%{?dist}
+Release:        46%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        System and Service Manager
@@ -1130,6 +1130,7 @@ Patch1038: 1038-fundamental-share-constants-for-confidential-virt-de.patch
 Patch1039: 1039-efi-add-helper-API-for-detecting-confidential-virtua.patch
 Patch1040: 1040-efi-don-t-pull-kernel-cmdline-from-SMBIOS-in-a-confi.patch
 Patch1041: 1041-Fix-detection-of-TDX-confidential-VM-on-Azure-platfo.patch
+Patch1042: 1042-ukify-Skip-test-on-architectures-without-UEFI.patch
 
 # Downstream-only patches (9000–9999)
 
@@ -2020,6 +2021,9 @@ systemd-hwdb update &>/dev/null || :
 %{_prefix}/lib/dracut/modules.d/70rhel-net-naming-sysattrs/*
 
 %changelog
+* Fri Aug 30 2024 systemd maintenance team <systemd-maint@redhat.com> - 252-46
+- ukify: Skip test on architectures without UEFI (RHEL-56019)
+
 * Sat Aug 24 2024 systemd team <systemd-maint@redhat.com> - 252-45
 - build ukify without noarch