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

Jump to bottom

spl: fix build with linux 5.1 #61181

Merged
merged 1 commit into from May 12, 2019
Merged

spl: fix build with linux 5.1 #61181

merged 1 commit into from May 12, 2019

Conversation

lheckemann
Copy link
Member

@lheckemann lheckemann commented May 9, 2019 •
edited

Upstream issue: openzfs/zfs#8697
Upstream fix (zfs repo): 782dfae3218b5f2029ce78722b999cb04e8ef001

This can't be applied cleanly as a patch, since spl has been moved
into the zfs repo since 0.7.13.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc maintainers @fpletz @wizeman @globin

@lheckemann
spl: fix build with linux 5.1
17303da 
Upstream issue: openzfs/zfs#8697
Upstream fix (zfs repo): 782dfae3218b5f2029ce78722b999cb04e8ef001

This can't be applied cleanly as a patch, since spl has been moved
into the zfs repo since 0.7.13.
@lheckemann
Copy link
Member Author

@GrahamcOfBorg build linuxPackages_5_1.spl linuxPackages_4_19.spl

@lheckemann lheckemann mentioned this pull request May 9, 2019
Merged
10 tasks
@grahamc grahamc added the 9.needs: port to stable A PR needs a backport to the stable release. label May 10, 2019
@vcunat vcunat merged commit 17303da into NixOS:master May 12, 2019
vcunat added a commit that referenced this pull request May 12, 2019
@vcunat
Merge #61181: spl: fix build with linux 5.1
359a734
vcunat added a commit that referenced this pull request May 12, 2019
@vcunat
Merge #61181: spl: fix build with linux 5.1
b531a3b 
(cherry picked from commit 359a734)
@vcunat vcunat removed the 9.needs: port to stable A PR needs a backport to the stable release. label May 12, 2019
@lheckemann lheckemann deleted the spl-5.1 branch May 12, 2019 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adisbladis adisbladis adisbladis left review comments

@grahamc grahamc grahamc left review comments

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lheckemann @adisbladis @grahamc @vcunat