public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grsecurity: fix kernel config and uncomment grsecurity kernels

This commit is contained in:
Dan Peebles 2016-01-23 16:58:35 +00:00
parent 85f9d04319
commit 8f9aea9ccc
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/build-support/grsecurity/default.nix
View File

@ -142,6 +142,7 @@ let
}; };
extraConfig = grsecConfig; extraConfig = grsecConfig;
features.grsecurity = true; features.grsecurity = true;
ignoreConfigErrors = true; # Too lazy to model the config options that work with grsecurity and don't for now
})) (args: grsecurityOverrider args grkern)); })) (args: grsecurityOverrider args grkern));
mkGrsecPkg = grkern: pkgs.linuxPackagesFor grkern (mkGrsecPkg grkern); mkGrsecPkg = grkern: pkgs.linuxPackagesFor grkern (mkGrsecPkg grkern);

4
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -23,6 +23,7 @@
# symbolic name and `patch' is the actual patch. The patch may # symbolic name and `patch' is the actual patch. The patch may
# optionally be compressed with gzip or bzip2. # optionally be compressed with gzip or bzip2.
kernelPatches ? [] kernelPatches ? []
, ignoreConfigErrors ? stdenv.platform.name != "pc"
, extraMeta ? {} , extraMeta ? {}
, ... , ...
}: }:
@ -41,14 +42,13 @@ let
in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches); in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches);
configfile = stdenv.mkDerivation { configfile = stdenv.mkDerivation {
inherit ignoreConfigErrors;
name = "linux-config-${version}"; name = "linux-config-${version}";
generateConfig = ./generate-config.pl; generateConfig = ./generate-config.pl;
kernelConfig = kernelConfigFun config; kernelConfig = kernelConfigFun config;
ignoreConfigErrors = stdenv.platform.name != "pc";
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
platformName = stdenv.platform.name; platformName = stdenv.platform.name;

6
pkgs/top-level/all-packages.nix
View File

@ -10321,9 +10321,9 @@ let
linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen; linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen;
# Testing kernels: outdated ATM # Testing kernels: outdated ATM
#linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop; linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop;
#linuxPackages_grsec_testing_server = grPackage grFlavors.linux_grsec_testing_server; linuxPackages_grsec_testing_server = grPackage grFlavors.linux_grsec_testing_server;
#linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen; linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen;
# ChromiumOS kernels # ChromiumOS kernels
linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14); linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14);