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.

Sign up for GitHub

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

Jump to bottom

gnu-efi: apply patch to fix build on armv6l #72819

Merged
merged 1 commit into from
Nov 6, 2019
Merged

gnu-efi: apply patch to fix build on armv6l #72819

merged 1 commit into from
Nov 6, 2019
+9 −1

Conversation

lopsided98
Copy link
Contributor

Motivation for this change

Applies a patch that I have submitted upstream to fix the build on armv6l. In nixpkgs, the build was broken by #72694, but this was really because it revealed an upstream bug.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @kirelagin

Sorry, something went wrong.

@lopsided98
Copy link
Contributor Author

@GrahamcOfBorg build gnu-efi

@lopsided98 lopsided98 mentioned this pull request Nov 5, 2019
Merged
10 tasks
@kirelagin
Copy link
Member

Why not just arm.* though?

@FRidh FRidh changed the base branch from master to staging November 5, 2019 13:18
@lopsided98
Copy link
Contributor Author

I updated the patch to allow any ARM version.

@Ericson2314 Ericson2314 merged commit 699418d into NixOS:staging Nov 6, 2019
@lopsided98 lopsided98 deleted the gnu-efi-armv6l branch November 6, 2019 03:14
@Ericson2314
Copy link
Member

@kirelagin You mean apply the patch conditionally? I prefer to unconditionally apply the patches were possible to indicate they are improvements to the code base and not platform-specific hacks; We've had a perception in the past that "more platforms means more mess" and harder maintenance, and I want to counter that by showing stuff gets upstreamed and the code quality goes up.

@lopsided98
Copy link
Contributor Author

lopsided98 commented Nov 6, 2019 •
edited
Loading

@Ericson2314 My original patch had a special case in the sed expression for armv6 (ie. armv[67].*), but I later updated it at @kirelagin's suggestion to just be armv.* since there was no real reason to restrict it to certain ARM versions.

I submitted the new version upstream as well, see: https://sourceforge.net/p/gnu-efi/patches/71/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer

Assignees
No one assigned
Labels
10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
Staging
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lopsided98 @kirelagin @Ericson2314 @matthewbauer