Upgrade to 6.1

This commit is contained in:
2023-09-27 08:27:12 +03:00
parent a4b2311998
commit 153829c749

View File

@@ -1,23 +1,23 @@
{ lib, linuxKernel, linuxPackagesFor, writeText, buildPackages, fetchurl, fetchFromGitHub, raspberrypifw, ... }: rec { { lib, linuxKernel, linuxPackagesFor, writeText, buildPackages, fetchurl, fetchFromGitHub, raspberrypifw, ... }: rec {
kernel = linuxKernel.kernels.linux_rpi4.override { kernel = linuxKernel.kernels.linux_rpi4.override {
argsOverride = rec { argsOverride = rec {
modDirVersion = "5.15.43-rt45"; modDirVersion = "6.1.54-rt15";
version = "${modDirVersion}-notag"; version = "${modDirVersion}-notag";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "linux"; repo = "linux";
rev = "97be5486aeff2253079e75fc3222fbe66118cf12"; rev = "cc08810f89e52337a99cc6ae5f53f08588357c5f";
sha256 = "7D4B68n3diMYU/1ugQ/8nESR5dRIsYfmGSNmbq3rKkM="; sha256 = "";
}; };
kernelPatches = [{ kernelPatches = [{
name = "rt"; name = "rt";
patch = fetchurl { patch = fetchurl {
url = "https://cdn.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patch-5.15.43-rt45.patch.xz"; url = "https://cdn.kernel.org/pub/linux/kernel/projects/rt/6.1/patch-6.1.54-rt15.patch.xz";
sha256 = "veAJl5zb5SEYQoGzoZtURFncHD42hQ8cX7zeS36CQvk="; sha256 = "";
}; };
}] ++ linuxKernel.kernels.linux_rpi4.kernelPatches; }] ++ linuxKernel.kernels.linux_rpi4.kernelPatches;
structuredExtraConfig = with lib.kernel; { structuredExtraConfig = with lib.kernel; {
KVM = lib.mkForce no; # Not compatible with PREEMPT_RT. NOTE: this conflict shoulb be fixed in 5.16 #KVM = lib.mkForce no; # Not compatible with PREEMPT_RT. NOTE: this conflict shoulb be fixed in 5.16
PREEMPT_RT = yes; PREEMPT_RT = yes;
EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt)
PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it.
@@ -33,8 +33,8 @@
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "firmware"; repo = "firmware";
rev = "f145afcfdc76157622588d5c58b95da24acea1e8"; rev = "6b37a457122714aa14b2c7df0926455173fd04f1";
sha256 = "dvUl3su9brcZ9Xamr/0UJWXuJG1FyDFPS5x5tYcJkl8="; sha256 = "";
}; };
}); });
} }