Skip to content

Commit 3be92e2

Browse files
committed
Reapply "Release bump systemd-boot to use new keys (#11439)"
This reverts commit dd652a9.
1 parent 78a3d9b commit 3be92e2

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Version: 255
1414
# determine the build information from local checkout
1515
Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
1616
%endif
17-
Release: 18%{?dist}
17+
Release: 19%{?dist}
1818
License: LGPL-2.1-or-later AND MIT AND GPL-2.0-or-later
1919
Vendor: Microsoft Corporation
2020
Distribution: Azure Linux
@@ -53,6 +53,9 @@ Provides: version(systemd-boot)%{_isa} = %version
5353
Obsoletes: systemd-udev < 252.2^
5454
Conflicts: grub2-efi-binary
5555

56+
Recommends: shim >= 15.8-3
57+
Conflicts: shim < 15.8-3
58+
5659
%description -n systemd-boot
5760
systemd-boot (short: sd-boot) is a simple UEFI boot manager. It provides a
5861
graphical menu to select the entry to boot and an editor for the kernel command
@@ -90,6 +93,10 @@ popd
9093
/boot/efi/EFI/BOOT/grubx64.efi
9194

9295
%changelog
96+
* Thu Dec 12 2024 Daniel McIlvaney <damcilva@microsoft.com> - 255-19
97+
- Version bump to force signing with new Azure Linux secure boot key
98+
- Add confilcts/recommends on shim to ensure the keys match
99+
93100
* Fri Sep 13 2024 Thien Trung Vuong <tvuong@microsoft.com> - 255-18
94101
- Update sd-boot install location
95102

SPECS/systemd/systemd.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Version: 255
5050
# determine the build information from local checkout
5151
Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
5252
%endif
53-
Release: 18%{?dist}
53+
Release: 19%{?dist}
5454

5555
# FIXME - hardcode to 'stable' for now as that's what we have in our blobstore
5656
%global stable 1
@@ -1216,6 +1216,9 @@ rm -f %{name}.lang
12161216
# %autochangelog. So we need to continue manually maintaining the
12171217
# changelog here.
12181218
%changelog
1219+
* Thu Dec 12 2024 Daniel McIlvaney <damcilva@microsoft.com> - 255-19
1220+
- Version bump to force signing with new Azure Linux secure boot key
1221+
12191222
* Fri Sep 13 2024 Thien Trung Vuong <tvuong@microsoft.com> - 255-18
12201223
- Install systemd-boot binary to ESP
12211224

0 commit comments

Comments
 (0)