Merge pull request #2333 from flatcar/chewi/grub-version

sys-boot/grub: Adjust version string to include flatcar1 suffix
This commit is contained in:
James Le Cuirot 2024-09-26 12:17:49 +01:00 committed by GitHub
commit d34ab03f21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,10 +1,20 @@
# Bump the flatcar version stated here every time we or Gentoo change patches
# that modify parts of GRUB that are installed to the boot partition. Reset the
# version back to 1 when the upstream GRUB version changes.
FLATCAR_VERSION=flatcar1
# Adjust the version string for Flatcar. This propagates throughout the source.
cros_pre_src_prepare_adjust_version() {
sed -i "/AC_INIT/s/\b${PV//./\\.}\b/\0-${FLATCAR_VERSION}/g" configure.ac || die
}
# Replace Gentoo's SBAT with Flatcar's. # Replace Gentoo's SBAT with Flatcar's.
cros_post_src_install_sbat() { cros_post_src_install_sbat() {
insinto /usr/share/grub insinto /usr/share/grub
newins - sbat.csv <<-EOF newins - sbat.csv <<-EOF
sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md 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,4,Free Software Foundation,grub,${PV},https://www.gnu.org/software/grub/
grub.flatcar,1,Flatcar,grub2,${PVR},https://github.com/flatcar/Flatcar grub.flatcar,1,Flatcar,grub2,${PV}-${FLATCAR_VERSION},https://github.com/flatcar/Flatcar
EOF EOF
} }