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

Bump Grub to 2.12 #46

Closed
wants to merge 2 commits into from
Closed

Bump Grub to 2.12 #46

wants to merge 2 commits into from

Conversation

danjujan
Copy link
Contributor

Update Grub to 2.12 and fix nasty bugs in the btrfs driver.
Compiles fine with gcc on aarch64 and x86_64. Unfortunately I cannot test if this still compiles with msvc.

@pbatard
Copy link
Owner

pbatard commented Apr 15, 2024

Thanks for this!

But I think you want to make sure that your patch does include the GRUB submodule update as well or else all the build checks are going to fail.

In short, your patch should include a section similar to:

--- a/grub
+++ b/grub
@@ -1 +1 @@
-Subproject commit 710cb5da349d9f03f966b19ec4087912f038fbde
+Subproject commit d9b4638c50b16d4722e66d334e2c1a674b4a45cc

with the SHA-1 updated to the one of current GRUB git repo...
And when you do create the commit, you must make sure that the GRUB patch has not been applied to the submodule, as the SHA-1 won't be found otherwise.

@pbatard
Copy link
Owner

pbatard commented Apr 15, 2024

Oh yeah, and gnu-efi has pretty much be broken ever since the Red-Hat and openSUSE people have decided that it should be aimed at compiling the Linux Shim, so you probably want to switch to using my version of gnu-efi at https://github.com/pbatard/gnu-efi (which is what I am planning to do for the next release).

@danjujan
Copy link
Contributor Author

Ok, should be fixed. Thank you for the quick reply!

@pbatard
Copy link
Owner

pbatard commented Apr 15, 2024

Hmm, it looks like MinGW on Linux may have changed the way it identifies itself, which appears to be breaking gnu-efi compilation on Linux. I'm probably going to have to fix my version of gnu-efi for that, but I have no idea when I'll get a chance to look into it...

@danjujan
Copy link
Contributor Author

No problem, take your time. I'll see what I can do in the meantime.

@pbatard
Copy link
Owner

pbatard commented May 15, 2024

I think I might have reworked your PR enough so that the builds succeed, so I am going to close this PR with the next push, though I may rework some more if some of the build fail...

@pbatard pbatard closed this in d9ffcec May 15, 2024
pbatard pushed a commit that referenced this pull request May 15, 2024
pbatard pushed a commit that referenced this pull request May 15, 2024
@pbatard
Copy link
Owner

pbatard commented May 15, 2024

Man, now I remember why I didn't want to bother with zstd with btrfs, because it's really a major PITA, and I had to spend way more time than I'd like fixing this PR. I can tell you one thing though, I am not going to go out of my way supporting more of btrfs in EfiFs than what we currently have, because the cost/benefit simply just not worth it.

For now, I guess not having the Linux/gnu-efi working is fine, as long as we have the other builds (I'll see if I can fix gnu-efi later on), and I would strongly encourage you or anyone interested in btrfs to test the drivers from the artifacts produced by https://github.com/pbatard/EfiFs/actions/runs/9103557282 because that's pretty much what's going to go be in the next EfiFs release (which will happen after EROFS is added to GRUB and I've had a chance to look into producing an EFI driver for it).

@danjujan
Copy link
Contributor Author

Thank you very much for your efforts. I will try to test the btrfs driver artifact in the next few days and report back to you.

@danjujan
Copy link
Contributor Author

Btrfs driver still works fine for me.

@pbatard
Copy link
Owner

pbatard commented May 19, 2024

Thanks for the report. I will therefore consider this request closed.

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