public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-rt_latest: 5.9.1-rt20 -> 5.10-rt17

Browse Source 
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.
This commit is contained in:
Orivej Desh 2020-12-14 21:15:10 +00:00
parent 15406f05c9
commit 2f6ac24357
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/kernel/linux-rt-5.9.nix → pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
View File

@ -6,22 +6,26 @@
, ... } @ args: , ... } @ args:
let let
version = "5.9.1-rt20"; # updated by ./update-rt.sh version = "5.10-rt17"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version; branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0; kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // { in buildLinux (args // {
inherit version; 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 { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0dn0xz81pphca5dkg6zh8c78p05f63rrr5ihqqsmhc4n73li2jms"; sha256 = "0hyav21vzz5v1kgb455pcz9ncg5qqzxmp60na290scwq7vj9kpyw";
}; };
kernelPatches = let rt-patch = { kernelPatches = let rt-patch = {
name = "rt"; name = "rt";
patch = fetchurl { patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0ma3mv475qgg0dri4928gi6z00d7s59pdwj0d6dh0mfzs2xddnyv"; sha256 = "0baf7363f6h3smr4lgw88dbpf4977j6c1asifyhc8zhd7100ckhn";
}; };
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

2
pkgs/os-specific/linux/kernel/update-rt.sh
View File

@ -58,7 +58,7 @@ update-if-needed() {
msg="$nixattr: $cur -> $new" msg="$nixattr: $cur -> $new"
else else
msg="$nixattr: init at $new" 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" cp "$prev" "$file"
cur=$(file-version "$file") cur=$(file-version "$file")
fi fi

6
pkgs/top-level/all-packages.nix
View File

@ -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 = [
kernelPatches.bridge_stp_helper kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper kernelPatches.request_key_helper
@ -18643,9 +18643,9 @@ in
# Realtime kernel packages. # Realtime kernel packages.
linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4;
linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6; 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 = 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 = linuxPackages-rt.kernel;
linux-rt_latest = linuxPackages-rt_latest.kernel; linux-rt_latest = linuxPackages-rt_latest.kernel;