BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

grsecurity: move version information to one place

Browse source
This commit is contained in:
tg(x) 2016-02-27 16:33:18 +01:00
parent d95321b83e
commit 7547960546
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/build-support/grsecurity/default.nix
View file

@ -22,18 +22,18 @@ let
vals = rec {
mkKernel = kernel: patch:
assert patch.kversion == kernel.version;
{ inherit kernel patch;
inherit (patch) grversion revision;
mkKernel = patch:
{
inherit patch;
inherit (patch) kernel grversion revision;
};
test-patch = with pkgs.kernelPatches; grsecurity_unstable;
test-patch = with pkgs.kernelPatches; grsecurity_testing;
stable-patch = with pkgs.kernelPatches; grsecurity_stable;
grKernel = if cfg.stable
then mkKernel pkgs.linux_3_14 stable-patch
else mkKernel pkgs.linux_4_4 test-patch;
then mkKernel stable-patch
else mkKernel test-patch;
## -- grsecurity configuration ---------------------------------------------

15
pkgs/os-specific/linux/kernel/patches.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, pkgs }:
let
@ -18,9 +18,10 @@ let
};
};
grsecPatch = { grversion ? "3.1", kversion, revision, branch, sha256 }:
grsecPatch = { grversion ? "3.1", kernel, kversion, revision, branch, sha256 }:
assert kversion == kernel.version;
{ name = "grsecurity-${grversion}-${kversion}";
inherit grversion kversion revision;
inherit grversion kernel kversion revision;
patch = fetchurl {
url = "https://github.com/slashbeast/grsecurity-scrape/blob/master/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true";
inherit sha256;
@ -80,14 +81,16 @@ rec {
};
grsecurity_stable = grsecPatch
{ kversion = "3.14.51";
{ kernel = pkgs.linux_3_14;
kversion = "3.14.51";
revision = "201508181951";
branch = "stable";
sha256 = "1sp1gwa7ahzflq7ayb51bg52abrn5zx1hb3pff3axpjqq7vfai6f";
};
grsecurity_unstable = grsecPatch
{ kversion = "4.4.2";
grsecurity_testing = grsecPatch
{ kernel = pkgs.linux_4_4;
kversion = "4.4.2";
revision = "201602182048";
branch = "test";
sha256 = "0dm0nzzja6ynzdz2k5h0ckys7flw307i3w0k1lwjxfj80civ73wr";