grsecurity: Fix building grsec-3.x.0 kernels

This commit is contained in:
Ricardo M. Correia 2014-01-29 19:06:45 +01:00
parent 12315a278c
commit 31fa2cd52b
3 changed files with 8 additions and 4 deletions

View File

@ -13,4 +13,4 @@ import ./generic.nix (args // rec {
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
})
} // (args.argsOverride or {}))

View File

@ -9,4 +9,4 @@ import ./generic.nix (args // rec {
};
features.iwlwifi = true;
})
} // (args.argsOverride or {}))

View File

@ -6660,13 +6660,17 @@ let
# config options you need (e.g. by overriding extraConfig). See list of options here:
# https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
modDirVersion = "${linux_3_2.version}-grsec";
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ];
argsOverride = {
modDirVersion = "${linux_3_2.modDirVersion}-grsec";
};
})) (args: grsecurityOverrider args));
linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: {
modDirVersion = "${linux_3_12.version}-grsec";
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_8 kernelPatches.grsec_path ];
argsOverride = {
modDirVersion = "${linux_3_12.modDirVersion}-grsec";
};
})) (args: grsecurityOverrider args));
linux_3_2_apparmor = lowPrio (linux_3_2.override {