Bump edk2 to 202605, shim to 16.1, and refresh GRUB 2.12 against Fedora#4119
Draft
chewi wants to merge 6 commits into
Draft
Bump edk2 to 202605, shim to 16.1, and refresh GRUB 2.12 against Fedora#4119chewi wants to merge 6 commits into
chewi wants to merge 6 commits into
Conversation
There was a problem hiding this comment.
Pull request overview
Updates Flatcar’s boot/firmware toolchain components (EDK2, shim, and GRUB patchset metadata) to newer upstream/Fedora baselines, with corresponding manifests and changelog entry.
Changes:
- Add EDK2 binary firmware package version
202605(with new distfile entries) and accept-keyword it for amd64/arm64 in the overlay profile. - Bump shim to
16.1, updating ebuilds and manifests; add a newshim-signed-16.1ebuild and signed-asset manifests. - Update GRUB environment metadata (
FLATCAR_VERSION/SBAT line) and drop a GRUB patch file that’s no longer carried.
Reviewed changes
Copilot reviewed 10 out of 12 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| sdk_container/src/third_party/portage-stable/sys-firmware/edk2-bin/Manifest | Add distfile hashes/sizes for edk2-bin 202605 QEMU targets. |
| sdk_container/src/third_party/portage-stable/sys-firmware/edk2-bin/edk2-bin-202605.ebuild | New ebuild for edk2-bin 202605 with per-QEMU-target binpkg unpack/install flow. |
| sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-16.1.ebuild | New shim 16.1 ebuild (EAPI 8) with updated build/install steps. |
| sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-15.8-r3.ebuild | Remove prior shim 15.8-r3 ebuild. |
| sdk_container/src/third_party/coreos-overlay/sys-boot/shim/Manifest | Update shim distfile manifest to 16.1 tarball. |
| sdk_container/src/third_party/coreos-overlay/sys-boot/shim-signed/shim-signed-16.1.ebuild | New ebuild to install pre-signed shim EFI binaries per arch. |
| sdk_container/src/third_party/coreos-overlay/sys-boot/shim-signed/Manifest | Update signed shim EFI artifact manifests to 16.1. |
| sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords | Accept-keyword edk2-bin 202605 for amd64/arm64. |
| sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-boot/grub/grub-2.12-01-execute-return-code.patch | Remove a GRUB patch file previously carried in user-patches. |
| sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-boot/grub | Bump Flatcar GRUB patchset version metadata and SBAT generation line. |
| changelog/updates/2026-06-23-boot-updates.md | Add user-facing changelog entry for grub/shim/edk2 updates. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For GRUB, I am targeting Fedora 45 rather than 44 now. They don't seem to consistently publish their changes for upstream, and the 44 branch hasn't changed since December.
How to use
See if it boots, particularly with Secure Boot enabled.
Testing done
I've manually tested my EDK2 builds for all the supported architectures on Gentoo. A Jenkins run has...
changelog/directory (user-facing change, bug fix, security fix, update)/bootand/usrsize, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.