jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-testing: Fix build with default config.

Browse Source 
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>
This commit is contained in:
aszlig 2015-12-01 11:08:12 +01:00
parent 38eb17c2e2
commit 79bd2b08ee
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -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 {}))