diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-12-01 11:08:12 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-12-01 11:22:29 +0100 |
| commit | 79bd2b08ee56cc5e900d2f3ad8bd3ea0b5d88415 (patch) | |
| tree | 047ce7eb8e2c11be8193db0859481c46e759cce2 /pkgs/os-specific/linux/kernel/linux-testing.nix | |
| parent | 38eb17c2e280469301639afc1a3f0e4d72935b6c (diff) | |
| download | nixlib-79bd2b08ee56cc5e900d2f3ad8bd3ea0b5d88415.tar nixlib-79bd2b08ee56cc5e900d2f3ad8bd3ea0b5d88415.tar.gz nixlib-79bd2b08ee56cc5e900d2f3ad8bd3ea0b5d88415.tar.bz2 nixlib-79bd2b08ee56cc5e900d2f3ad8bd3ea0b5d88415.tar.lz nixlib-79bd2b08ee56cc5e900d2f3ad8bd3ea0b5d88415.tar.xz nixlib-79bd2b08ee56cc5e900d2f3ad8bd3ea0b5d88415.tar.zst nixlib-79bd2b08ee56cc5e900d2f3ad8bd3ea0b5d88415.zip | |
linux-testing: Fix build with default config.
Regression introduced by 03a3a905b9c547f5ac687f341fb8f1ce636f2959. Our default config includes all modules and since torvalds/linux@47ca6ec this results in a regression due to in a circular dependency between libcfs and LNet: depmod: ERROR: Found 2 modules in dependency cycles! depmod: ERROR: Cycle detected: lnet -> libcfs -> lnet The discussion regarding this in the LKML is here: https://lkml.org/lkml/2015/11/2/388 So this adds a patch which is not yet included in mainline and has been submitted to the LKML at: https://lkml.org/lkml/2015/11/6/987 Built successfully via "nix-build -A linux-testing". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-testing.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 33f78f5580e5..3a9cb4104871 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -19,4 +19,13 @@ import ./generic.nix (args // rec { # Should the testing kernels ever be built on Hydra? extraMeta.hydraPlatforms = []; + kernelPatches = stdenv.lib.singleton { + name = "fix-depmod-cycle"; + patch = fetchurl { + name = "lustre-remove-IOC_LIBCFS_PING_TEST-ioctl.patch"; + url = "https://lkml.org/lkml/diff/2015/11/6/987/1"; + sha256 = "0ja9103f4s65fyn5b6z6lggplnm97hhz4rmpfn4m985yqw7zgihd"; + }; + }; + } // (args.argsOverride or {})) |