linux-rt_5_11: remove

main
TredwellGit 3 years ago
parent c783c8d859
commit f726b6c476
  1. 45
      pkgs/os-specific/linux/kernel/linux-rt-5.11.nix
  2. 2
      pkgs/top-level/aliases.nix
  3. 11
      pkgs/top-level/linux-kernels.nix

@ -1,45 +0,0 @@
{ lib, buildLinux, fetchurl
, kernelPatches ? [ ]
, structuredExtraConfig ? {}
, extraMeta ? {}
, argsOverride ? {}
, ... } @ args:
let
version = "5.11.4-rt11"; # 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 = "1i8dfw83ndaylwji7lazfckk113plvnz7kh1yppbfg35r6przrc8";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1az6cn9jj3bnjgwzzrjy1adnrnn06p2vzsnc1iib4xhs0sfr27hc";
};
}; 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)

@ -461,7 +461,6 @@ mapAliases ({
linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4;
linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10;
linuxPackages_rt_5_11 = linuxKernel.packages.linux_rt_5_11;
linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2;
linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3;
@ -489,7 +488,6 @@ mapAliases ({
linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
linux_5_10 = linuxKernel.kernels.linux_5_10;
linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11;
linux_5_14 = linuxKernel.kernels.linux_5_14;
linux_5_15 = linuxKernel.kernels.linux_5_15;

@ -159,14 +159,6 @@ in {
];
};
linux_rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.export-rt-sched-migrate
];
};
linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@ -483,7 +475,6 @@ in {
# realtime kernel packages
linux_rt_5_4 = packagesFor kernels.linux_rt_5_4;
linux_rt_5_10 = packagesFor kernels.linux_rt_5_10;
linux_rt_5_11 = packagesFor kernels.linux_rt_5_11;
};
rpiPackages = {
@ -526,7 +517,7 @@ in {
linux_latest = packages.linux_5_15;
linux_mptcp = packages.linux_mptcp_95;
linux_rt_default = packages.linux_rt_5_4;
linux_rt_latest = packages.linux_rt_5_11;
linux_rt_latest = packages.linux_rt_5_10;
linux_hardkernel_latest = packages.hardkernel_4_14;
};

Loading…
Cancel
Save