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

[23.05] zfs: fix evaluation and build on aarch64 systems #237875

Merged
merged 2 commits into from
Jul 4, 2023
Merged

[23.05] zfs: fix evaluation and build on aarch64 systems #237875

merged 2 commits into from
Jul 4, 2023

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Jun 15, 2023 •
edited
Loading

backport of #237873

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jun 15, 2023
@Mic92 Mic92 changed the title zfs: add option to restore kernel_neon for linux 6.2 support on aarch64 [23.05] zfs: fix evaluation and build on aarch64 systems Jun 15, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Jun 15, 2023
adisbladis and others added 2 commits June 15, 2023 10:19
@adisbladis @Mic92
zfs: 2.1.11 -> 2.1.12
a897385 
(cherry picked from commit 900c093)
@Mic92
zfs: add option to restore kernel_neon for linux 6.2 support on aarch64
15384bf 
Introduced in torvalds/linux@aaeca98
with the usual disdain for ZFS.

We have been there in the past with
<https://www.phoronix.com/news/NixOS-Linux-5.0-ZFS-FPU-Drop> /
NixOS#61076.

This fixes ZFS on aarch64 until the next breakage.

See openzfs/zfs#14555 for original upstream
issue.
@Mic92 Mic92 force-pushed the fix-aarch64-zfs-backport branch from 60e994e to 15384bf Compare June 15, 2023 08:19
@Mic92 Mic92 mentioned this pull request Jun 15, 2023
Closed
1 task
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500 and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Jun 15, 2023
@jakubgs jakubgs mentioned this pull request Jun 18, 2023
Closed
@wegank wegank merged commit 1bc78db into NixOS:release-23.05 Jul 4, 2023
@Mic92 Mic92 deleted the fix-aarch64-zfs-backport branch August 4, 2023 19:59
@Mic92 Mic92 restored the fix-aarch64-zfs-backport branch September 19, 2024 13:09
@Mic92 Mic92 deleted the fix-aarch64-zfs-backport branch January 18, 2025 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Mic92 @wegank @adisbladis @RaitoBezarius