Skip to content

Tweak the Makefile to decouple EFI and GPU features #342

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

Merged
merged 1 commit into from
Jun 5, 2025

Conversation

ggoodman
Copy link
Contributor

@ggoodman ggoodman commented Jun 4, 2025

This tweaks the EFI=1 make option so that it doesn't automatically bring along the gpu feature. Since EFI resets FEATURE_FLAGS, the test for GPU and SND (not implied by efi rust feature) are evaluated after.

@tylerfanelli
Copy link
Member

Thanks for the contribution @ggoodman, can you add a Signed-off-by line to the commit?

This tweaks the `EFI=1` make option so that it doesn't automatically bring
along the `gpu` feature. Since `EFI` resets `FEATURE_FLAGS`, the test
for `GPU` and `SND` (not implied by `efi` rust feature) are evaluated
after.

Signed-off-by: Geoffrey Goodman <[email protected]>
@ggoodman ggoodman force-pushed the make-decouple-efi-gpu branch from f2ce153 to a514586 Compare June 4, 2025 12:48
@ggoodman
Copy link
Contributor Author

ggoodman commented Jun 4, 2025

@tylerfanelli 👍🏼

Copy link
Member

@jakecorrenti jakecorrenti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed everything works with Podman still.

This will require a change in the various homebrew formulas to make sure we don't break users expecting the GPU functionality. cc/ @slp

@slp
Copy link
Collaborator

slp commented Jun 5, 2025

This will require a change in the various homebrew formulas to make sure we don't break users expecting the GPU functionality. cc/ @slp

Yup, but it's fine, I'll keep an eye on it.

@slp slp merged commit b80a18a into containers:main Jun 5, 2025
6 checks passed
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.

4 participants