-
-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #96702 from orivej/linux-rt
linux-rt(,_latest): init at 5.4.61-rt37 and 5.6.19-rt12
- Loading branch information
Showing
5 changed files
with
188 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
{ lib, buildLinux, fetchurl | ||
, kernelPatches ? [ ] | ||
, structuredExtraConfig ? {} | ||
, extraMeta ? {} | ||
, argsOverride ? {} | ||
, ... } @ args: | ||
|
||
let | ||
version = "5.4.61-rt37"; # 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 = "197y2yb60m1k8i7mig4pa9wsrklfxq81ba3zfahwb2b31w2kvwc6"; | ||
}; | ||
|
||
kernelPatches = let rt-patch = { | ||
name = "rt"; | ||
patch = fetchurl { | ||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; | ||
sha256 = "1qgd55x62pczgmxcxbigkg6f622ma5a6mz4gi55a8mlbxzh2pddj"; | ||
}; | ||
}; 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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
{ lib, buildLinux, fetchurl | ||
, kernelPatches ? [ ] | ||
, structuredExtraConfig ? {} | ||
, extraMeta ? {} | ||
, argsOverride ? {} | ||
, ... } @ args: | ||
|
||
let | ||
version = "5.6.19-rt12"; # 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 = "1s0yc1138sglbm4vyizl4r7hnc1l7nykdjp4063ad67yayr2ylv2"; | ||
}; | ||
|
||
kernelPatches = let rt-patch = { | ||
name = "rt"; | ||
patch = fetchurl { | ||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; | ||
sha256 = "0ia8rx0615x0z2s4ppw1244crg7c5ak07c9n3wbnz7y8bk8hyxws"; | ||
}; | ||
}; 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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
#!/usr/bin/env bash | ||
set -euo pipefail | ||
|
||
# To update all rt kernels run: ./update-rt.sh | ||
|
||
# To update just one ./linux-rt-5.X.nix run: ./update-rt.sh ./linux-rt-5.X.nix | ||
|
||
# To add a new kernel branch 5.Y run: ./update-rt.sh ./linux-rt-5.Y.nix | ||
# (with nonexistent .nix file) and update all-packages.nix. | ||
|
||
# To commit run with: env COMMIT=1 | ||
|
||
mirror=https://kernel.org/pub/linux/kernel | ||
|
||
main() { | ||
if [ $# -ge 1 ]; then | ||
update-if-needed "$1" | ||
else | ||
update-all-if-needed | ||
fi | ||
} | ||
|
||
update-all-if-needed() { | ||
for f in "$(dirname "$0")"/linux-rt-*.nix; do | ||
update-if-needed "$f" | ||
done | ||
} | ||
|
||
file-version() { | ||
file="$1" # e.g. ./linux-rt-5.4.nix | ||
if [ -e "$file" ]; then | ||
grep ' version = ' "$file" | grep -o '[0-9].[^"]*' | ||
fi | ||
} | ||
|
||
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 }' | ||
} | ||
|
||
update-if-needed() { | ||
file="$1" # e.g. ./linux-rt-5.4.nix (created if does not exist) | ||
branch=$(basename "$file" .nix) # e.g. linux-rt-5.4 | ||
branch=${branch#linux-rt-} # e.g. 5.4 | ||
cur=$(file-version "$file") # e.g. 5.4.59-rt36 or empty | ||
new=$(latest-rt-version "$branch") # e.g. 5.4.61-rt37 | ||
kversion=${new%-*} # e.g. 5.4.61 | ||
major=${branch%.*} # e.g 5 | ||
nixattr="linux-rt_${branch/./_}" | ||
if [ "$new" = "$cur" ]; then | ||
echo "$nixattr: $cur (up-to-date)" | ||
return | ||
fi | ||
khash=$(nix-prefetch-url "$mirror/v${major}.x/linux-${kversion}.tar.xz") | ||
phash=$(nix-prefetch-url "$mirror/projects/rt/${branch}/older/patch-${new}.patch.xz") | ||
if [ "$cur" ]; then | ||
msg="$nixattr: $cur -> $new" | ||
else | ||
msg="$nixattr: init at $new" | ||
prev=$(ls "$(dirname "$0")"/linux-rt-*.nix | tail -1) | ||
cp "$prev" "$file" | ||
cur=$(file-version "$file") | ||
fi | ||
echo "$msg" | ||
sed -i "$file" \ | ||
-e "s/$cur/$new/" \ | ||
-e "s|kernel/v[0-9]*|kernel/v$major|" \ | ||
-e "1,/.patch.xz/ s/sha256 = .*/sha256 = \"$khash\";/" \ | ||
-e "1,/.patch.xz/! s/sha256 = .*/sha256 = \"$phash\";/" | ||
if [ "${COMMIT:-}" ]; then | ||
git add "$file" | ||
git commit -m "$msg" | ||
fi | ||
} | ||
|
||
return 2>/dev/null || main "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters