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

fix: switch latest images to use ungated upstream kernel #1722

Merged
merged 4 commits into from
Oct 6, 2024

Conversation

p5
Copy link
Member

@p5 p5 commented Sep 29, 2024

Closes #1717

This PR switches Bluerora to use the kernel version provided by upstream (still through kernel-cache), as recommended by some kernel developers.

@p5 p5 requested a review from castrojo as a code owner September 29, 2024 14:37
@dosubot dosubot bot added size:XS This PR changes 0-9 lines, ignoring generated files. bug Something isn't working github_actions Pull requests that update GitHub Actions code labels Sep 29, 2024
@p5 p5 marked this pull request as draft September 29, 2024 14:53
castrojo added a commit that referenced this pull request Sep 29, 2024
Vanilla kernel doesn't support this, we'll get it in 6.12.

Part of #1722
@castrojo castrojo mentioned this pull request Sep 29, 2024
@bsherman bsherman marked this pull request as ready for review October 6, 2024 21:58
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Oct 6, 2024
@bsherman
Copy link
Contributor

bsherman commented Oct 6, 2024

I like this approach since it installs our dual-signed version of the kernel even if the version is the same as upstream Fedora.

@bsherman bsherman added this pull request to the merge queue Oct 6, 2024
@bsherman bsherman removed this pull request from the merge queue due to a manual request Oct 6, 2024
@bsherman bsherman merged commit bab923c into main Oct 6, 2024
48 of 50 checks passed
@bsherman bsherman deleted the switch-latest-to-upstream-kernel branch October 6, 2024 22:16
bsherman added a commit that referenced this pull request Oct 6, 2024
PR #1722 passed all build checks, but after merging, we saw that for
latest, where we use the stock upstream kernel, but with our added
signature, rechunker complains of multiple kernels in /usr/lib/modules

Also, the method which was being used to remove the old kernel packages
does not run when building locally on a Fedora host. So trying a
different approach.

See: https://github.com/ublue-os/bluefin/actions/runs/11205608165/job/31145333321#step:23:233
bsherman added a commit that referenced this pull request Oct 7, 2024
This simplifies the logic around installing cached kernels by always
doing it. This means that "vanilla"/"main" images will have the true
vanilla kernel replaced by essentially the same package, but the
repackaged version which we have signed in addition to the Fedora
signature.

This fixes a bug introduced in #1722 where accidentally stopped
installing the cached kernels for asus/surface images.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working github_actions Pull requests that update GitHub Actions code lgtm This PR has been approved by a maintainer size:XS This PR changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Switch latest back to vanilla Fedora kernel
3 participants