From a716a45b198d57f456a016acc418bc0e41cd7559 Mon Sep 17 00:00:00 2001 From: Faye Date: Mon, 21 Feb 2022 16:26:23 -0500 Subject: [PATCH 1/2] linux-rt: Fix incorrect sorting of kernel version numbers when determining latest version When determining the latest linux-rt kernel version to update to, the list of filenames that `update-rt.sh` fetches from upstream is sorted lexicographically, while `update-rt.sh` assumes it's sorted in version order. As a result, for example, 5.10.78 is considered newer than 5.10.100. This change applies `sort --version-sort` to the extracted version numbers to properly identify the latest version. --- pkgs/os-specific/linux/kernel/update-rt.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/update-rt.sh b/pkgs/os-specific/linux/kernel/update-rt.sh index ccb017933420..a9e0577fae92 100755 --- a/pkgs/os-specific/linux/kernel/update-rt.sh +++ b/pkgs/os-specific/linux/kernel/update-rt.sh @@ -38,6 +38,7 @@ latest-rt-version() { curl -sL "$mirror/projects/rt/$branch/sha256sums.asc" | sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/p}' | grep -v '\-rc' | + sort --version-sort | tail -n 1 } From acf78131f7eecda95bc426b781835b644db42233 Mon Sep 17 00:00:00 2001 From: Faye Date: Mon, 21 Feb 2022 16:26:56 -0500 Subject: [PATCH 2/2] linux-rt_5_10: 5.10.78-rt55 -> 5.10.100-rt62 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index c8d42ddda746..70be0e58ebce 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.78-rt55"; # updated by ./update-rt.sh + version = "5.10.100-rt62"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y"; + sha256 = "16892wnfkdpqy3v4xmdzlqn5zlfrgz9wqh6vadnx58xnr6pnasfm"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1wcw682r238qi5jgn5zk9m6j2506p9ypfax13bzhjfyjzz3h98kp"; + sha256 = "1wimp4ckaqp5cfvkf50gv3s5biyr0sjifz4faw23m07ciydm15k0"; }; }; in [ rt-patch ] ++ kernelPatches;