From 02fe186d1ee8583df3a58b069d4b7a27d608b689 Mon Sep 17 00:00:00 2001 From: Daniel McIlvaney Date: Fri, 13 Dec 2024 15:43:08 -0800 Subject: [PATCH] Release bump systemd-boot to use new keys (#11439) --- .../systemd-boot-signed/systemd-boot-signed.spec | 9 ++++++++- SPECS/systemd/systemd.spec | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec b/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec index 59a3ed26055..6178a71997b 100644 --- a/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec +++ b/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec @@ -14,7 +14,7 @@ Version: 255 # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') %endif -Release: 18%{?dist} +Release: 19%{?dist} License: LGPL-2.1-or-later AND MIT AND GPL-2.0-or-later Vendor: Microsoft Corporation Distribution: Azure Linux @@ -53,6 +53,9 @@ Provides: version(systemd-boot)%{_isa} = %version Obsoletes: systemd-udev < 252.2^ Conflicts: grub2-efi-binary +Recommends: shim >= 15.8-3 +Conflicts: shim < 15.8-3 + %description -n systemd-boot systemd-boot (short: sd-boot) is a simple UEFI boot manager. It provides a graphical menu to select the entry to boot and an editor for the kernel command @@ -90,6 +93,10 @@ popd /boot/efi/EFI/BOOT/grubx64.efi %changelog +* Thu Dec 12 2024 Daniel McIlvaney - 255-19 +- Version bump to force signing with new Azure Linux secure boot key +- Add confilcts/recommends on shim to ensure the keys match + * Fri Sep 13 2024 Thien Trung Vuong - 255-18 - Update sd-boot install location diff --git a/SPECS/systemd/systemd.spec b/SPECS/systemd/systemd.spec index 291aa6bbbb4..bf0b98fa483 100644 --- a/SPECS/systemd/systemd.spec +++ b/SPECS/systemd/systemd.spec @@ -50,7 +50,7 @@ Version: 255 # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') %endif -Release: 18%{?dist} +Release: 19%{?dist} # FIXME - hardcode to 'stable' for now as that's what we have in our blobstore %global stable 1 @@ -1216,6 +1216,9 @@ rm -f %{name}.lang # %autochangelog. So we need to continue manually maintaining the # changelog here. %changelog +* Thu Dec 12 2024 Daniel McIlvaney - 255-19 +- Version bump to force signing with new Azure Linux secure boot key + * Fri Sep 13 2024 Thien Trung Vuong - 255-18 - Install systemd-boot binary to ESP