linux-rt_6_1: init at 6.1.19-rt8 (#222174)
Also sets the linux_rt_latest to 6.1. Closes #222094
This commit is contained in:
parent
154af0e584
commit
487f0f9283
45
pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
Normal file
45
pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
Normal file
|
@ -0,0 +1,45 @@
|
|||
{ lib, buildLinux, fetchurl
|
||||
, kernelPatches ? [ ]
|
||||
, structuredExtraConfig ? {}
|
||||
, extraMeta ? {}
|
||||
, argsOverride ? {}
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "6.1.19-rt8"; # 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 = "0iw6b9gmhpk6r1asds5kfg6drqvaxy15xicqx9ga873cbxp1r6cy";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "1nd3x7rgssf3f9vxsplnp5zg0cbixm9lf6sswlnl6pcvj4adagg1";
|
||||
};
|
||||
}; 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)
|
|
@ -874,6 +874,7 @@ mapAliases ({
|
|||
linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
|
||||
linux-rt_5_15 = linuxKernel.kernels.linux_rt_5_15;
|
||||
linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
|
||||
linux-rt_6_1 = linuxKernel.kernels.linux_rt_6_1;
|
||||
linuxPackages_4_14 = linuxKernel.packages.linux_4_14;
|
||||
linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
|
||||
linuxPackages_4_9 = linuxKernel.packages.linux_4_9;
|
||||
|
@ -895,6 +896,7 @@ mapAliases ({
|
|||
linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10;
|
||||
linuxPackages_rt_5_15 = linuxKernel.packages.linux_rt_5_15;
|
||||
linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4;
|
||||
linuxPackages_rt_6_1 = linuxKernel.packages.linux_rt_6_1;
|
||||
linux_4_14 = linuxKernel.kernels.linux_4_14;
|
||||
linux_4_19 = linuxKernel.kernels.linux_4_19;
|
||||
linux_4_9 = linuxKernel.kernels.linux_4_9;
|
||||
|
|
|
@ -172,6 +172,15 @@ in {
|
|||
];
|
||||
};
|
||||
|
||||
linux_rt_6_1 = callPackage ../os-specific/linux/kernel/linux-rt-6.1.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.fix-em-ice-bonding
|
||||
kernelPatches.export-rt-sched-migrate
|
||||
];
|
||||
};
|
||||
|
||||
linux_6_2 = callPackage ../os-specific/linux/kernel/linux-6.2.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
|
@ -568,6 +577,7 @@ in {
|
|||
linux_rt_5_4 = packagesFor kernels.linux_rt_5_4;
|
||||
linux_rt_5_10 = packagesFor kernels.linux_rt_5_10;
|
||||
linux_rt_5_15 = packagesFor kernels.linux_rt_5_15;
|
||||
linux_rt_6_1 = packagesFor kernels.linux_rt_6_1;
|
||||
};
|
||||
|
||||
rpiPackages = {
|
||||
|
@ -625,7 +635,7 @@ in {
|
|||
linux_latest = packages.linux_6_2;
|
||||
linux_mptcp = packages.linux_mptcp_95;
|
||||
linux_rt_default = packages.linux_rt_5_4;
|
||||
linux_rt_latest = packages.linux_rt_5_10;
|
||||
linux_rt_latest = packages.linux_rt_6_1;
|
||||
linux_hardkernel_latest = packages.hardkernel_4_14;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue