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

linux_testing_bcachefs: 4.15.2018.04.14 -> 4.15.2018.08.03 #44533

Merged
merged 2 commits into from Aug 6, 2018
Merged

linux_testing_bcachefs: 4.15.2018.04.14 -> 4.15.2018.08.03 #44533

merged 2 commits into from Aug 6, 2018

Conversation

Chiiruno
Copy link
Contributor

@Chiiruno Chiiruno commented Aug 6, 2018 •
edited

Motivation for this change

Version bump, as requested by @Mic92 .
While bcachefs-tools compiles, fine, there's a problem with the kernel module that I'm not sure how to fix.

make: Entering directory '/build/bcachefs-e7a00a5'
make[1]: Entering directory '/build/bcachefs-e7a00a5/build'
  HOSTCC  scripts/basic/fixdep
  GEN     ./Makefile
  HOSTCC  scripts/kconfig/conf.o
  YACC    scripts/kconfig/zconf.tab.c
/bin/sh: bison: not found
make[2]: *** [scripts/Makefile.lib:217: scripts/kconfig/zconf.tab.c] Error 127
make[1]: *** [/build/bcachefs-e7a00a5/Makefile:514: defconfig] Error 2
make[1]: Leaving directory '/build/bcachefs-e7a00a5/build'
make: *** [Makefile:146: sub-make] Error 2
make: Leaving directory '/build/bcachefs-e7a00a5'

I also did a bit of a restructure.

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@Chiiruno
Copy link
Contributor Author

Chiiruno commented Aug 6, 2018 •
edited

I, of course, tried adding bison and ensuring it's in the build inputs.

@Chiiruno
Copy link
Contributor Author

Chiiruno commented Aug 6, 2018 •
edited

It would seem that somehow bison isn't detected somehow.
Is there a way to ensure bison in installed and in the build inputs (if applicable) then?
I tried the usual way like you would in stdenv.mkDerivation with putting it into the top inputs and and build inputs, but that didn't work for the kernel module.
Is there a specific way we do this for kernel modules with buildLinux?

Mic92
Mic92 reviewed Aug 6, 2018
View reviewed changes
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix Outdated
@@ -1,22 +1,21 @@
{ stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.15.2018.04.14";
version = "4.15.2018.08.03";
modDirVersion = "4.15.0";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at the buildLinux expression in https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel/generic.nix#L94, it adds bison for 4.16er kernels. Is it the case that the kernel version was rebased to a 4.16er kernel?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes indeed https://evilpiepirate.org/git/bcachefs.git/commit/?id=0adb32858b0bddf4ada5f364a84ed60b196dbcda

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How strange. I guess he didn't update the tag.

@Chiiruno
Copy link
Contributor Author

Chiiruno commented Aug 6, 2018

Okay, everything appears to work now.
Thanks for pointing out the kernel version!

@xeji
Copy link
Contributor

xeji commented Aug 6, 2018

@GrahamcOfBorg build bcachefs-tools

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: bcachefs-tools

Partial log (click to expand)


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

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

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: bcachefs-tools

Partial log (click to expand)

strip is /nix/store/zrs21zqcchgyabjf4xfimncdq16njizc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/99s0gjjas30ms1rkj54s4l4y9ylh78x1-bcachefs-tools-unstable-2018-07-21/sbin
patching script interpreter paths in /nix/store/99s0gjjas30ms1rkj54s4l4y9ylh78x1-bcachefs-tools-unstable-2018-07-21
/nix/store/99s0gjjas30ms1rkj54s4l4y9ylh78x1-bcachefs-tools-unstable-2018-07-21/etc/initramfs-tools/scripts/local-premount/bcachefs: interpreter directive changed from "/bin/sh" to "/nix/store/6vqgi9d49smsbr2qxra52yhipg0yxf9f-bash-4.4-p23/bin/sh"
/nix/store/99s0gjjas30ms1rkj54s4l4y9ylh78x1-bcachefs-tools-unstable-2018-07-21/etc/initramfs-tools/hooks/bcachefs: interpreter directive changed from "/bin/sh" to "/nix/store/6vqgi9d49smsbr2qxra52yhipg0yxf9f-bash-4.4-p23/bin/sh"
/nix/store/99s0gjjas30ms1rkj54s4l4y9ylh78x1-bcachefs-tools-unstable-2018-07-21/sbin/mkfs.bcachefs: interpreter directive changed from "/bin/sh" to "/nix/store/6vqgi9d49smsbr2qxra52yhipg0yxf9f-bash-4.4-p23/bin/sh"
/nix/store/99s0gjjas30ms1rkj54s4l4y9ylh78x1-bcachefs-tools-unstable-2018-07-21/sbin/fsck.bcachefs: interpreter directive changed from "/bin/sh" to "/nix/store/6vqgi9d49smsbr2qxra52yhipg0yxf9f-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/99s0gjjas30ms1rkj54s4l4y9ylh78x1-bcachefs-tools-unstable-2018-07-21...
moving /nix/store/99s0gjjas30ms1rkj54s4l4y9ylh78x1-bcachefs-tools-unstable-2018-07-21/sbin/* to /nix/store/99s0gjjas30ms1rkj54s4l4y9ylh78x1-bcachefs-tools-unstable-2018-07-21/bin
/nix/store/99s0gjjas30ms1rkj54s4l4y9ylh78x1-bcachefs-tools-unstable-2018-07-21

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: bcachefs-tools

Partial log (click to expand)

strip is /nix/store/1hi76hr87bd1y1q1qjk0lv8nmcjip1c8-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/x7vmyn099hq3vglz4zvwprjlpqma6qqq-bcachefs-tools-unstable-2018-07-21/sbin
patching script interpreter paths in /nix/store/x7vmyn099hq3vglz4zvwprjlpqma6qqq-bcachefs-tools-unstable-2018-07-21
/nix/store/x7vmyn099hq3vglz4zvwprjlpqma6qqq-bcachefs-tools-unstable-2018-07-21/etc/initramfs-tools/scripts/local-premount/bcachefs: interpreter directive changed from "/bin/sh" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/sh"
/nix/store/x7vmyn099hq3vglz4zvwprjlpqma6qqq-bcachefs-tools-unstable-2018-07-21/etc/initramfs-tools/hooks/bcachefs: interpreter directive changed from "/bin/sh" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/sh"
/nix/store/x7vmyn099hq3vglz4zvwprjlpqma6qqq-bcachefs-tools-unstable-2018-07-21/sbin/mkfs.bcachefs: interpreter directive changed from "/bin/sh" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/sh"
/nix/store/x7vmyn099hq3vglz4zvwprjlpqma6qqq-bcachefs-tools-unstable-2018-07-21/sbin/fsck.bcachefs: interpreter directive changed from "/bin/sh" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/x7vmyn099hq3vglz4zvwprjlpqma6qqq-bcachefs-tools-unstable-2018-07-21...
moving /nix/store/x7vmyn099hq3vglz4zvwprjlpqma6qqq-bcachefs-tools-unstable-2018-07-21/sbin/* to /nix/store/x7vmyn099hq3vglz4zvwprjlpqma6qqq-bcachefs-tools-unstable-2018-07-21/bin
/nix/store/x7vmyn099hq3vglz4zvwprjlpqma6qqq-bcachefs-tools-unstable-2018-07-21

@xeji
Copy link
Contributor

xeji commented Aug 6, 2018

Checked build of linux_testing_bcachefs locally.

@xeji xeji merged commit bd758ed into NixOS:master Aug 6, 2018
@Chiiruno Chiiruno deleted the dev/bcachefs branch August 6, 2018 22:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@dywedir dywedir dywedir left review comments

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
6 participants
@Chiiruno @xeji @GrahamcOfBorg @Mic92 @dywedir @Madouura