Merge #244006: linux_rt_5_4: fix build

This commit is contained in:
Vladimír Čunát
2023-07-17 22:00:59 +02:00
3 changed files with 6 additions and 11 deletions
+6 -1
View File
@@ -9,7 +9,7 @@ let
testsForLinuxPackages = linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: {
name = "kernel-${linuxPackages.kernel.version}";
meta = with pkgs.lib.maintainers; {
maintainers = [ nequissimus atemu ];
maintainers = [ nequissimus atemu ma27 ];
};
nodes.machine = { ... }:
@@ -33,6 +33,11 @@ let
linux_6_1_hardened
linux_6_3_hardened
linux_6_4_hardened
linux_rt_5_4
linux_rt_5_10
linux_rt_5_15
linux_rt_6_1
linux_libre
linux_testing;
};
@@ -57,13 +57,4 @@
name = "export-rt-sched-migrate";
patch = ./export-rt-sched-migrate.patch;
};
CVE-2023-32233 = rec {
name = "CVE-2023-32233";
patch = fetchpatch {
name = name + ".patch";
url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=c1592a89942e9678f7d9c8030efa777c0d57edab";
hash = "sha256-DYPWgraXPNeFkjtuDYkFXHnCJ4yDewrukM2CCAqC2BE=";
};
};
}
-1
View File
@@ -127,7 +127,6 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.CVE-2023-32233
];
};