b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

linux-kernels: fix missing linux-hardened kernels

Browse source 
due to merge conflict
This commit is contained in:
Ryan Burns 2021-08-17 23:42:23 -07:00
parent 6e1214d9da
commit 3af43aa879
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/top-level/linux-kernels.nix
View file

@ -189,6 +189,13 @@ let
linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel;
linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };
linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { };
linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { };
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
});
/* Linux kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a
@ -417,9 +424,9 @@ let
});
# Hardened Linux
hardenedPackagesFor = kernel': overrides:
hardenedKernelFor = kernel': overrides:
let kernel = kernel'.override overrides;
in packagesFor (kernel.override {
in kernel.override {
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
inherit lib;
inherit (kernel) version;
@ -429,7 +436,8 @@ let
];
modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra;
isHardened = true;
});
};
hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides);
vanillaPackages = {
# recurse to build modules for the kernels