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

spl: fix build with linux 5.1 #61181

Merged
merged 1 commit into from May 12, 2019

Conversation

Projects
None yet
4 participants
@lheckemann
Copy link
Member

commented May 9, 2019

Upstream issue: zfsonlinux/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

spl: fix build with linux 5.1
Upstream issue: zfsonlinux/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

This comment has been minimized.

Copy link
Member Author

commented May 9, 2019

@GrahamcOfBorg build linuxPackages_5_1.spl linuxPackages_4_19.spl

@lheckemann lheckemann referenced this pull request May 9, 2019

Merged

Kernel config: use PREEMPT_VOLUNTARY #61162

3 of 10 tasks complete
@vcunat

vcunat approved these changes May 12, 2019

@vcunat vcunat merged commit 17303da into NixOS:master May 12, 2019

15 of 16 checks passed

linuxPackages_4_19.spl, linuxPackages_5_1.spl on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
linuxPackages_4_19.spl, linuxPackages_5_1.spl on aarch64-linux Success
Details
linuxPackages_4_19.spl, linuxPackages_5_1.spl on x86_64-linux Success
Details

vcunat added a commit that referenced this pull request May 12, 2019

vcunat added a commit that referenced this pull request May 12, 2019

Merge #61181: spl: fix build with linux 5.1
(cherry picked from commit 359a734)

@lheckemann lheckemann deleted the lheckemann:spl-5.1 branch May 12, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.