diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-20 00:02:31 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-20 00:02:31 +0000 |
commit | dd8348e316f6805ea2d28591126603c78d5ae30e (patch) | |
tree | c4f7b47befe05e85a63cdc3b3a7905643b0e9c51 /pkgs/os-specific | |
parent | a142a62a96c42e22b77ce3e386bacd7e78fd92ff (diff) | |
parent | e5105e6cecf09b8c9374f5b2782913c74bc88cc3 (diff) | |
download | nixlib-dd8348e316f6805ea2d28591126603c78d5ae30e.tar nixlib-dd8348e316f6805ea2d28591126603c78d5ae30e.tar.gz nixlib-dd8348e316f6805ea2d28591126603c78d5ae30e.tar.bz2 nixlib-dd8348e316f6805ea2d28591126603c78d5ae30e.tar.lz nixlib-dd8348e316f6805ea2d28591126603c78d5ae30e.tar.xz nixlib-dd8348e316f6805ea2d28591126603c78d5ae30e.tar.zst nixlib-dd8348e316f6805ea2d28591126603c78d5ae30e.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-rt-6.6.nix | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix new file mode 100644 index 000000000000..b586dc392a6c --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -0,0 +1,45 @@ +{ lib, buildLinux, fetchurl +, kernelPatches ? [ ] +, structuredExtraConfig ? {} +, extraMeta ? {} +, argsOverride ? {} +, ... } @ args: + +let + version = "6.6.15-rt22"; # 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/v6.x/linux-${kversion}.tar.xz"; + sha256 = "1ajzby6isqji1xlp660m4qj2i2xs003vsjp1jspziwl7hrzhqadb"; + }; + + kernelPatches = let rt-patch = { + name = "rt"; + patch = fetchurl { + url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; + sha256 = "0dr4lb6f95vj8vzhlvy353dk6k694f1s6qfxr10m48hzyyqyaxdy"; + }; + }; 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) |