grsecurity: fix features.grsecurity
Previously, features.grsecurity wasn't actually set due to a bug in the grsec builder. We now rely on the generic kernel builder to set features from kernelPatches.
This commit is contained in:
parent
b56f7acc78
commit
e5c3a52afc
2 changed files with 3 additions and 2 deletions
|
@ -20,8 +20,7 @@ assert (kernel.version == grsecPatch.kver);
|
|||
|
||||
overrideDerivation (kernel.override {
|
||||
inherit modDirVersion;
|
||||
kernelPatches = [ { inherit (grsecPatch) name patch; } ] ++ kernelPatches ++ (kernel.kernelPatches or []);
|
||||
features = (kernel.features or {}) // { grsecurity = true; };
|
||||
kernelPatches = [ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []);
|
||||
inherit extraConfig;
|
||||
ignoreConfigErrors = true;
|
||||
}) (attrs: {
|
||||
|
|
|
@ -31,6 +31,8 @@ let
|
|||
url = "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${name}.patch";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
features.grsecurity = true;
|
||||
};
|
||||
in
|
||||
|
||||
|
|
Loading…
Reference in a new issue