From c13af4fcb5133514f4e8c18e81c3008fab2b446a Mon Sep 17 00:00:00 2001 From: Sam Estep Date: Mon, 1 Jun 2026 16:42:06 +0000 Subject: [PATCH] linuxKernel.packages.linux_7_0.tsme-test: 7.0.10-unstable-2022-12-07 -> 7.0.10-unstable-2026-02-09 Assisted-by: Claude:opus-4.8 --- pkgs/os-specific/linux/tsme-test/default.nix | 17 ++++++++++++++--- .../linux/tsme-test/include-slab.patch | 10 ++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 pkgs/os-specific/linux/tsme-test/include-slab.patch diff --git a/pkgs/os-specific/linux/tsme-test/default.nix b/pkgs/os-specific/linux/tsme-test/default.nix index a88db395cd4f..6602e2ea0cae 100644 --- a/pkgs/os-specific/linux/tsme-test/default.nix +++ b/pkgs/os-specific/linux/tsme-test/default.nix @@ -8,15 +8,26 @@ stdenv.mkDerivation { pname = "tsme-test"; - version = "${kernel.version}-unstable-2022-12-07"; + version = "${kernel.version}-unstable-2026-02-09"; src = fetchFromGitHub { owner = "AMDESE"; repo = "mem-encryption-tests"; - rev = "7abb072ffc50ceb0b4145ae84105ce6c91bd1ff4"; - hash = "sha256-v0KAGlo6ci0Ij1NAiMUK0vWDHBiFnpQG4Er6ArIKncQ="; + rev = "361bf41092aec06d7f6e7be239a62bc5a5ff2c66"; + hash = "sha256-aDv4gXcAXOBnJ256Ph06q0qBa9bSXvTbAG+AClFJUTI="; }; + patches = [ + # tsme-test.c calls kzalloc()/kzalloc_node()/kfree() without including + # . It only compiled on newer kernels because slab.h is + # reachable transitively via (mm.h -> huge_mm.h -> fs.h -> + # slab.h); the fs.h -> slab.h link was added in v5.18 and is absent from + # v5.17 and earlier, so the module fails to build on 5.10/5.15. Add the + # include explicitly. + # https://github.com/torvalds/linux/commit/8b9f3ac5b01db85c6cf74c2c3a71280cc3045c9c + ./include-slab.patch + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; makeFlags = kernelModuleMakeFlags ++ [ diff --git a/pkgs/os-specific/linux/tsme-test/include-slab.patch b/pkgs/os-specific/linux/tsme-test/include-slab.patch new file mode 100644 index 000000000000..0fc5af80ecb9 --- /dev/null +++ b/pkgs/os-specific/linux/tsme-test/include-slab.patch @@ -0,0 +1,10 @@ +--- a/tsme-test.c ++++ b/tsme-test.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + #include + #include +