From 2f6ac2435767c1052147b1397ebb0c8f1a2c5583 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 14 Dec 2020 21:15:10 +0000
Subject: linux-rt_latest: 5.9.1-rt20 -> 5.10-rt17

This does not keep 5.9 series because it has known issues and rt
upstream has stopped maintaining it in favor of 5.10.

"ls -v" sorts by version, making 5.10 the next $prev kernel.
---
 pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 45 +++++++++++++++++++++++++
 pkgs/os-specific/linux/kernel/linux-rt-5.9.nix  | 41 ----------------------
 pkgs/os-specific/linux/kernel/update-rt.sh      |  2 +-
 pkgs/top-level/all-packages.nix                 |  6 ++--
 4 files changed, 49 insertions(+), 45 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-rt-5.9.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
new file mode 100644
index 00000000000..4eec6c431b6
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -0,0 +1,45 @@
+{ lib, buildLinux, fetchurl
+, kernelPatches ? [ ]
+, structuredExtraConfig ? {}
+, extraMeta ? {}
+, argsOverride ? {}
+, ... } @ args:
+
+let
+  version = "5.10-rt17"; # 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 = "0hyav21vzz5v1kgb455pcz9ncg5qqzxmp60na290scwq7vj9kpyw";
+  };
+
+  kernelPatches = let rt-patch = {
+    name = "rt";
+    patch = fetchurl {
+      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
+      sha256 = "0baf7363f6h3smr4lgw88dbpf4977j6c1asifyhc8zhd7100ckhn";
+    };
+  }; in [ rt-patch ] ++ lib.remove 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)
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.9.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.9.nix
deleted file mode 100644
index 988335d0d3b..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.9.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, buildLinux, fetchurl
-, kernelPatches ? [ ]
-, structuredExtraConfig ? {}
-, extraMeta ? {}
-, argsOverride ? {}
-, ... } @ args:
-
-let
-  version = "5.9.1-rt20"; # updated by ./update-rt.sh
-  branch = lib.versions.majorMinor version;
-  kversion = builtins.elemAt (lib.splitString "-" version) 0;
-in buildLinux (args // {
-  inherit version;
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "0dn0xz81pphca5dkg6zh8c78p05f63rrr5ihqqsmhc4n73li2jms";
-  };
-
-  kernelPatches = let rt-patch = {
-    name = "rt";
-    patch = fetchurl {
-      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0ma3mv475qgg0dri4928gi6z00d7s59pdwj0d6dh0mfzs2xddnyv";
-    };
-  }; in [ rt-patch ] ++ lib.remove 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)
diff --git a/pkgs/os-specific/linux/kernel/update-rt.sh b/pkgs/os-specific/linux/kernel/update-rt.sh
index bcfa494d7e7..4cbd45524a8 100755
--- a/pkgs/os-specific/linux/kernel/update-rt.sh
+++ b/pkgs/os-specific/linux/kernel/update-rt.sh
@@ -58,7 +58,7 @@ update-if-needed() {
         msg="$nixattr: $cur -> $new"
     else
         msg="$nixattr: init at $new"
-        prev=$(ls "$(dirname "$0")"/linux-rt-*.nix | tail -1)
+        prev=$(ls -v "$(dirname "$0")"/linux-rt-*.nix | tail -1)
         cp "$prev" "$file"
         cur=$(file-version "$file")
     fi
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 568413d71fc..8d833be6196 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18384,7 +18384,7 @@ in
     ];
   };
 
-  linux-rt_5_9 = callPackage ../os-specific/linux/kernel/linux-rt-5.9.nix {
+  linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
       kernelPatches.request_key_helper
@@ -18643,9 +18643,9 @@ in
   # Realtime kernel packages.
   linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4;
   linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6;
-  linuxPackages-rt_5_9 = linuxPackagesFor pkgs.linux-rt_5_9;
+  linuxPackages-rt_5_10 = linuxPackagesFor pkgs.linux-rt_5_10;
   linuxPackages-rt = linuxPackages-rt_5_4;
-  linuxPackages-rt_latest = linuxPackages-rt_5_9;
+  linuxPackages-rt_latest = linuxPackages-rt_5_10;
   linux-rt = linuxPackages-rt.kernel;
   linux-rt_latest = linuxPackages-rt_latest.kernel;
 
-- 
cgit 1.4.1