From 8f9aea9ccc1fda3fc3b1573d4afa9c26d96ad693 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sat, 23 Jan 2016 16:58:35 +0000 Subject: [PATCH] grsecurity: fix kernel config and uncomment grsecurity kernels --- pkgs/build-support/grsecurity/default.nix | 1 + pkgs/os-specific/linux/kernel/generic.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index db450ab9eb99..841effcfca11 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -142,6 +142,7 @@ let }; extraConfig = grsecConfig; 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)); mkGrsecPkg = grkern: pkgs.linuxPackagesFor grkern (mkGrsecPkg grkern); diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index b42892f9f2d8..59d3642e6227 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -23,6 +23,7 @@ # symbolic name and `patch' is the actual patch. The patch may # optionally be compressed with gzip or bzip2. kernelPatches ? [] +, ignoreConfigErrors ? stdenv.platform.name != "pc" , extraMeta ? {} , ... }: @@ -41,14 +42,13 @@ let in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches); configfile = stdenv.mkDerivation { + inherit ignoreConfigErrors; name = "linux-config-${version}"; generateConfig = ./generate-config.pl; kernelConfig = kernelConfigFun config; - ignoreConfigErrors = stdenv.platform.name != "pc"; - nativeBuildInputs = [ perl ]; platformName = stdenv.platform.name; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08bd06243c9c..e9b96d00a74d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10321,9 +10321,9 @@ let linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen; # Testing kernels: outdated ATM - #linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop; - #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_desktop = grPackage grFlavors.linux_grsec_testing_desktop; + linuxPackages_grsec_testing_server = grPackage grFlavors.linux_grsec_testing_server; + linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen; # ChromiumOS kernels linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14);