Skip to content

Commit

Permalink
Release bump systemd-boot to use new keys (#11439)
Browse files Browse the repository at this point in the history
  • Loading branch information
dmcilvaney authored Dec 13, 2024
1 parent 63d05a5 commit 02fe186
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
9 changes: 8 additions & 1 deletion SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -90,6 +93,10 @@ popd
/boot/efi/EFI/BOOT/grubx64.efi

%changelog
* Thu Dec 12 2024 Daniel McIlvaney <[email protected]> - 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 <[email protected]> - 255-18
- Update sd-boot install location

Expand Down
5 changes: 4 additions & 1 deletion SPECS/systemd/systemd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <[email protected]> - 255-19
- Version bump to force signing with new Azure Linux secure boot key

* Fri Sep 13 2024 Thien Trung Vuong <[email protected]> - 255-18
- Install systemd-boot binary to ESP

Expand Down

0 comments on commit 02fe186

Please sign in to comment.