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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-02-14 06:16:29 +00:00
committed by GitHub
parent 8d8fe35281 aaf0a68d81
commit 6d694e7ee1
27 changed files with 429 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
View File

@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.4.84-rt47"; # updated by ./update-rt.sh
version = "5.4.93-rt51"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "058mhczv6whjwxn7jjh1c6n5zrqjdnvbl2mp7jkfrg6frpvgr189";
sha256 = "08nmwd13z10866pc16fqbj41krnvk6hxkl4nmhdkpk346r04jx6k";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0nccxf9l9ycvb782f48zrbl59vi674qq7yjyaks97440pgyd1jg0";
sha256 = "1ffipbnzv8rnmawjlglm667jq67asdr1mwrfhsmwkvlmivm9k4x1";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

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

@@ -36,7 +36,8 @@ file-version() {
latest-rt-version() {
branch="$1" # e.g. 5.4
curl -sL "$mirror/projects/rt/$branch/sha256sums.asc" |
sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/; p; q }'
sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/p}' |
tail -n 1
}
update-if-needed() {