Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sys-boot/grub: Move to portage-stable, bump to 2.12 #2318

Merged
merged 1 commit into from
Sep 17, 2024
Merged

sys-boot/grub: Move to portage-stable, bump to 2.12 #2318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/portage-stable-packages-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,7 @@ sys-block/thin-provisioning-tools

sys-boot/efibootmgr
sys-boot/gnu-efi
sys-boot/grub
sys-boot/mokutil

sys-devel/bc
Expand Down
1 change: 1 addition & 0 deletions changelog/updates/2024-09-06-grub-2.12.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- grub ([2.12](https://lists.gnu.org/archive/html/grub-devel/2023-12/msg00052.html))
28 changes: 14 additions & 14 deletions sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-boot/grub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
PKG_INSTALL_MASK+=" /etc/grub.d/00_header
/etc/grub.d/10_linux
/etc/grub.d/30_os-prober
/etc/grub.d/40_custom
/etc/grub.d/README
/lib64/grub/grub-mkconfig_lib
/lib64/grub/update-grub_lib"
INSTALL_MASK+=" /etc/grub.d/00_header
/etc/grub.d/10_linux
/etc/grub.d/30_os-prober
/etc/grub.d/40_custom
/etc/grub.d/README
/lib64/grub/grub-mkconfig_lib
/lib64/grub/update-grub_lib"
# Replace Gentoo's SBAT with Flatcar's.
cros_post_src_install_sbat() {
insinto /usr/share/grub
newins - sbat.csv <<-EOF
sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
grub,4,Free Software Foundation,grub,${PV},https://www.gnu.org/software/grub/
grub.flatcar,1,Flatcar,grub2,${PVR},https://github.com/flatcar/Flatcar
EOF
}

# Flatcar does not use grub-install or grub-mkconfig. All the files under /etc
# relate to grub-mkconfig.
INSTALL_MASK+=" ${EPREFIX}/etc/ *grub-install* *mkconfig*"
PKG_INSTALL_MASK+=" ${EPREFIX}/etc/ *grub-install* *mkconfig*"
15 changes: 6 additions & 9 deletions ...ty/coreos-overlay/sys-boot/grub/README.md → ...reos/user-patches/sys-boot/grub/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Flatcar uses a patched version of the GRUB, which implements the functionality to
read the [Flatcar Container Linux partition table](https://www.flatcar.org/docs/latest/reference/developer-guides/sdk-disk-partitions/#partition-table)
read the [Flatcar Container Linux partition table](https://www.flatcar.org/docs/latest/reference/developer-guides/sdk-disk-partitions/#partition-table).

## History

Expand All @@ -11,14 +11,11 @@ and referenced in the Flatcar's coreos-overlay. Except for a few, now many chang
where brought into the system.

The repo was maintained at 2.02 version. During the 2.06 migration, the philosophy
to use a separate repo was scraped, and a single patch file was created. The patch
to use a separate repo was scrapped, and two patch files were created. The patch
files migrated only the essential commits, and dropped all the other commits, which
were either half-baked, or redundant at the point of migration. The two patches are applied
on top of the grub sources, and emerge is done.
were either half-baked, or redundant at the point of migration.

Given below are the list of commits that were referenced to create the two patches.

## Summary of the patches
## Summary of the Flatcar patches

The patch starts with adding a new implementation of reading the GPT instead
of using the traditional module. It provides essential functionality to interact
Expand All @@ -33,9 +30,9 @@ partition booting. The `gptrepair` command implements the repair functions for
GPT information on a specified device. Few other functions include searching
devices by partition label or partition UUID.

## Commits
## Commits in the Flatcar patches

Below are the commits that are picked to create the two patches for the grub. One is
Below are the commits that are picked to create the two Flatcar patches. One is
descriptive, and other is comprehensive.

<details>
Expand Down
Loading
Loading