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

zfs, spl: 0.7.5 -> 0.7.6 #34713

Merged
merged 1 commit into from Feb 8, 2018
Merged

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Feb 7, 2018

Update, fix 4.15 compat.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Fixes compat with 4.15
(cc #34459)

I do not use ZFS so I have not tested using the result, just that it builds.

@dtzWill
Copy link
Member Author

dtzWill commented Feb 7, 2018

@GrahamcOfBorg build linuxPackages_4_15.zfs

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

error: while evaluating the attribute 'handled' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/stdenv/generic/check-meta.nix:204:3:
while evaluating 'handleEvalIssue' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/stdenv/generic/check-meta.nix:127:21, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/stdenv/generic/check-meta.nix:205:10:
while evaluating the attribute 'name' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/zfs/default.nix:32:7:
while evaluating 'optionalString' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/strings.nix:138:26, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/zfs/default.nix:32:45:
while evaluating the attribute 'linux_4_15' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:12963:3:
while evaluating 'callPackageWith' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:113:35, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:12963:16:
while evaluating 'makeOverridable' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:72:24, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:117:8:
while evaluating anonymous function at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/kernel/linux-4.15.nix:1:1, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:74:12:
while evaluating anonymous function at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/kernel/generic.nix:1:1, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/kernel/linux-4.15.nix:5:1:
assertion failed at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/kernel/generic.nix:33:1

@dtzWill
Copy link
Member Author

dtzWill commented Feb 7, 2018

@GrahamcOfBorg test installer.zfsroot

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘zfs-user-0.7.6’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/zfs/default.nix:124 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

 /nix/store/6m7ldqalxz3818rzc557zh17szy6bqf6-coreutils-8.29/bin/install -c -m 644 zfs.release zfs_config.h module/Module.symvers '/nix/store/fngi7qzd1kdd99crwz2iqcl6i6wj2iay-zfs-kernel-0.7.6-4.15.1/zfs-0.7.6/4.15.1'
make[2]: Leaving directory '/tmp/nix-build-zfs-kernel-0.7.6-4.15.1.drv-0/source'
make[1]: Leaving directory '/tmp/nix-build-zfs-kernel-0.7.6-4.15.1.drv-0/source'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/fngi7qzd1kdd99crwz2iqcl6i6wj2iay-zfs-kernel-0.7.6-4.15.1
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/fngi7qzd1kdd99crwz2iqcl6i6wj2iay-zfs-kernel-0.7.6-4.15.1/lib  /nix/store/fngi7qzd1kdd99crwz2iqcl6i6wj2iay-zfs-kernel-0.7.6-4.15.1/libexec 
patching script interpreter paths in /nix/store/fngi7qzd1kdd99crwz2iqcl6i6wj2iay-zfs-kernel-0.7.6-4.15.1
checking for references to /tmp/nix-build-zfs-kernel-0.7.6-4.15.1.drv-0 in /nix/store/fngi7qzd1kdd99crwz2iqcl6i6wj2iay-zfs-kernel-0.7.6-4.15.1...
/nix/store/fngi7qzd1kdd99crwz2iqcl6i6wj2iay-zfs-kernel-0.7.6-4.15.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

/nix/store/qhb40bgp2h6p1qac4azxaswr50yiw1rh-zfs-user-0.7.6-lib/libexec/zfs/zed.d/statechange-notify.sh: interpreter directive changed from "/bin/sh" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/sh"
/nix/store/qhb40bgp2h6p1qac4azxaswr50yiw1rh-zfs-user-0.7.6-lib/libexec/zfs/zed.d/vdev_clear-led.sh: interpreter directive changed from "/bin/sh" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/sh"
/nix/store/qhb40bgp2h6p1qac4azxaswr50yiw1rh-zfs-user-0.7.6-lib/libexec/zfs/zed.d/vdev_attach-led.sh: interpreter directive changed from "/bin/sh" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/sh"
/nix/store/qhb40bgp2h6p1qac4azxaswr50yiw1rh-zfs-user-0.7.6-lib/libexec/zfs/zed.d/pool_import-led.sh: interpreter directive changed from "/bin/sh" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/sh"
checking for references to /tmp/nix-build-zfs-user-0.7.6.drv-0 in /nix/store/qhb40bgp2h6p1qac4azxaswr50yiw1rh-zfs-user-0.7.6-lib...
shrinking RPATHs of ELF executables and libraries in /nix/store/yqbsxh3jz1yvgd1nfhpmm85rd4hp0csb-zfs-user-0.7.6-dev
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/yqbsxh3jz1yvgd1nfhpmm85rd4hp0csb-zfs-user-0.7.6-dev/lib 
patching script interpreter paths in /nix/store/yqbsxh3jz1yvgd1nfhpmm85rd4hp0csb-zfs-user-0.7.6-dev
checking for references to /tmp/nix-build-zfs-user-0.7.6.drv-0 in /nix/store/yqbsxh3jz1yvgd1nfhpmm85rd4hp0csb-zfs-user-0.7.6-dev...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

these derivations will be built:
  /nix/store/dl3aava8g1h432hqrv10101jpmxfi6pw-zfs-user-0.7.6.drv
waiting for locks or build slots...
/nix/store/971c16d41sz96bpyr58sp9zj8r2cp6x2-zfs-user-0.7.6

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

 /nix/store/jcbv749iz8fbkyaykfd1brfhzr4mb393-coreutils-8.29/bin/install -c -m 644 zfs.release zfs_config.h module/Module.symvers '/nix/store/zj06s905kw7b4kdz4kiqj7hfv74lmhbs-zfs-kernel-0.7.6-4.15.1/zfs-0.7.6/4.15.1'
make[2]: Leaving directory '/build/source'
make[1]: Leaving directory '/build/source'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/zj06s905kw7b4kdz4kiqj7hfv74lmhbs-zfs-kernel-0.7.6-4.15.1
strip is /nix/store/xmpjypwjmp2qi1chs5kr0hacnh161ls4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/zj06s905kw7b4kdz4kiqj7hfv74lmhbs-zfs-kernel-0.7.6-4.15.1/lib  /nix/store/zj06s905kw7b4kdz4kiqj7hfv74lmhbs-zfs-kernel-0.7.6-4.15.1/libexec
patching script interpreter paths in /nix/store/zj06s905kw7b4kdz4kiqj7hfv74lmhbs-zfs-kernel-0.7.6-4.15.1
checking for references to /build in /nix/store/zj06s905kw7b4kdz4kiqj7hfv74lmhbs-zfs-kernel-0.7.6-4.15.1...
/nix/store/zj06s905kw7b4kdz4kiqj7hfv74lmhbs-zfs-kernel-0.7.6-4.15.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

machine# [   45.472521] systemd-shutdown[1]: Deactivating swaps.
machine# [   45.473653] systemd-shutdown[1]: All swaps deactivated.
machine# [   45.476629] ACPI: Preparing to enter system sleep state S5
machine# [   45.477794] reboot: Power down
collecting coverage data
syncing
test script finished in 2235.21s
vde_switch: EOF on stdin, cleaning up and exiting
cleaning up
/nix/store/mjz807z8ibvq3qxry022anhf2qp0is3j-vm-test-run-installer-zfs-root

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

machine: exit status 1
machine: output:
error: command `nixos-install < /dev/null >&2' did not succeed (exit code 1)
command `nixos-install < /dev/null >&2' did not succeed (exit code 1)
cleaning up
killing machine (pid 627)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
builder for '/nix/store/ipw8b4xjx5vx1dpiwlx472ssc5j98743-vm-test-run-installer-zfs-root.drv' failed with exit code 255
error: build of '/nix/store/ipw8b4xjx5vx1dpiwlx472ssc5j98743-vm-test-run-installer-zfs-root.drv' failed

@dtzWill
Copy link
Member Author

dtzWill commented Feb 7, 2018

aarch64 failure appears already present (and AFAICT has never passed): https://hydra.nixos.org/build/68517677

Naturally the darwin failures are expected :).

Fixes compat with 4.15
(cc NixOS#34459)
@dtzWill
Copy link
Member Author

dtzWill commented Feb 8, 2018

(rebased onto master to ensure the test results are accurate for recent kernel updates (incl 4.15.1 -> 4.15.2))

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

/nix/store/971c16d41sz96bpyr58sp9zj8r2cp6x2-zfs-user-0.7.6

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘zfs-user-0.7.6’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/zfs/default.nix:124 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

/nix/store/4w1gkc6g2jqnayhisj8597l6hmijzav1-zfs-user-0.7.6

@adisbladis
Copy link
Member

@GrahamcOfBorg test zfs

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

error: attribute 'zfs' in selection path 'tests.zfs' not found

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

error: attribute ‘zfs’ in selection path ‘tests.zfs’ not found

@adisbladis
Copy link
Member

@GrahamcOfBorg test zfs.stable

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

error: attribute 'zfs' in selection path 'tests.zfs.stable' not found

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

error: attribute ‘zfs’ in selection path ‘tests.zfs.stable’ not found

@adisbladis adisbladis merged commit e860b65 into NixOS:master Feb 8, 2018
@adisbladis
Copy link
Member

Thanks! 👍

@adisbladis adisbladis mentioned this pull request Feb 8, 2018
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants