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.

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

sys-boot/grub: Adjust version string to include flatcar1 suffix #2333

Merged
merged 1 commit into from
Sep 26, 2024

Conversation

chewi
Copy link
Contributor

@chewi chewi commented Sep 17, 2024

sys-boot/grub: Adjust version to include flatcar1 suffix

We will bump this every time we or Gentoo change patches that modify parts of GRUB that are installed to the boot partition. We will reset the version back to 1 when the upstream GRUB version changes.

Without this, we are bound by Gentoo's PVR string, which we cannot change when we need to make changes to our own patches. The shim review wants to know the full version number of our GRUB build, and it would look bad to make such changes without changing the version.

This suffix is also applied to the Flatcar entry in the SBAT, which is especially important for the shim review.

The published binary package will still be labelled with the Gentoo PVR, but that seems less important given that end users cannot update individual packages on Flatcar installations.

How to use

Boot the image from CI and see what GRUB version it shows when booting.

Testing done

I've tested the image built in CI.

  • Changelog entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update) -- N/A
  • Inspected CI output for image differences: /boot and /usr size, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.

We will bump this every time we or Gentoo change patches that modify
parts of GRUB that are installed to the boot partition. We will reset
the version back to 1 when the upstream GRUB version changes.

Without this, we are bound by Gentoo's PVR string, which we cannot
change when we need to make changes to our own patches. The shim review
wants to know the full version number of our GRUB build, and it would
look bad to make such changes without changing the version.

This suffix is also applied to the Flatcar entry in the SBAT, which is
especially important for the shim review.

The published binary package will still be labelled with the Gentoo PVR,
but that seems less important given that end users cannot update
individual packages on Flatcar installations.

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
@chewi chewi requested a review from a team September 17, 2024 14:51
@chewi chewi self-assigned this Sep 17, 2024
@chewi
Copy link
Contributor Author

chewi commented Sep 17, 2024

I've now tested an image. This is what it looks like.

image

Copy link

github-actions bot commented Sep 17, 2024

Build action triggered: https://github.com/flatcar/scripts/actions/runs/10919793450

@chewi
Copy link
Contributor Author

chewi commented Sep 18, 2024

Hmmm, what happens with binary packages if they have the same PVR? Do they get overwritten? If so, that's probably okay. If not, that's a problem.

@chewi
Copy link
Contributor Author

chewi commented Sep 18, 2024

Oh, it's probably fine because we publish them per-release.

@chewi chewi merged commit d34ab03 into main Sep 26, 2024
1 check failed
@chewi chewi deleted the chewi/grub-version branch September 26, 2024 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants