f2281f6186
Previously the code took the kernelPatches of the final derivation, which might or might not be what was passed to the derivation in the original call. The previous behaviour caused various hacks to become neccessary to avoid duplicates in kernelPatches. (cherry picked from commit 436f61c878e3992b3d980168a5532416dd5be504)
46 lines
1.6 KiB
Nix
46 lines
1.6 KiB
Nix
{ lib, buildLinux, fetchurl
|
|
, kernelPatches ? [ ]
|
|
, structuredExtraConfig ? {}
|
|
, extraMeta ? {}
|
|
, argsOverride ? {}
|
|
, ... } @ args:
|
|
|
|
let
|
|
version = "5.10.73-rt54"; # updated by ./update-rt.sh
|
|
branch = lib.versions.majorMinor version;
|
|
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
|
in buildLinux (args // {
|
|
inherit version;
|
|
|
|
# modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ.
|
|
modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version
|
|
else lib.replaceStrings ["-"] [".0-"] version;
|
|
|
|
src = fetchurl {
|
|
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
|
sha256 = "0xhf0g5pra27hnavpy0y3mn05m5hqn5rd3d6fx0a3vr35c1jicpd";
|
|
};
|
|
|
|
kernelPatches = let rt-patch = {
|
|
name = "rt";
|
|
patch = fetchurl {
|
|
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
|
sha256 = "0szqm9f939p9z701i5hj881nf5bhfa0a6037bbcz974y0x8g9nmk";
|
|
};
|
|
}; in [ rt-patch ] ++ kernelPatches;
|
|
|
|
structuredExtraConfig = with lib.kernel; {
|
|
PREEMPT_RT = yes;
|
|
# Fix error: unused option: PREEMPT_RT.
|
|
EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt)
|
|
# Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n').
|
|
PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it.
|
|
# Fix error: unused option: RT_GROUP_SCHED.
|
|
RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch.
|
|
} // structuredExtraConfig;
|
|
|
|
extraMeta = extraMeta // {
|
|
inherit branch;
|
|
};
|
|
} // argsOverride)
|