Revert "grsecurity: work around for #20490"
This reverts commit e38b74ba89d3d03e01ee751131d2a6dc316ac33a.
I failed to notice f19c961b4e461da045f2e72e73701059e5117be0; better
use that fix instead.
commit4c7323545b21e103f6e864abb0dcec314eed6ae9
authorJoachim Fasting <joachifm@fastmail.fm>
dateSun 27 Nov 2016, 21:36 (10 years ago)
parentbfc187f
pkgs/os-specific/linux/kernel/grsecurity-modinst.patchdeleted−12
@@ -1,12 +0,0 @@
1−diff -ruN a/scripts/Makefile.modinst b/scripts/Makefile.modinst
2−--- a/scripts/Makefile.modinst 2016-11-15 07:49:06.000000000 +0100
3−+++ b/scripts/Makefile.modinst 2016-11-18 13:45:07.977270500 +0100
4−@@ -9,7 +9,7 @@
5−
6− #
7−
8−-__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
9−+__modules := $(shell find $(MODVERDIR) -name '*.mod' -exec grep -h '\.ko$$' '{}' \; | sort)
10− modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
11−
12− PHONY += $(modules)
pkgs/os-specific/linux/kernel/patches.nix−8
@@ -99,14 +99,6 @@ rec {
9999 patch = ./grsecurity-nixos-kmod.patch;
100100 };
101101
102− # A temporary work-around for execvp: arglist too long error during
103− # module_install. Without this, no modules are installed into the
104− # resulting output.
105− grsecurity_modinst =
106− { name = "grsecurity-modinst";
107− patch = ./grsecurity-modinst.patch;
108− };
109−
110102 crc_regression =
111103 { name = "crc-backport-regression";
112104 patch = ./crc-regression.patch;
pkgs/top-level/all-packages.nix+1−1
@@ -11207,7 +11207,7 @@ in
1120711207 ];
1120811208 };
1120911209 grsecPatch = self.kernelPatches.grsecurity_testing;
11210− kernelPatches = with self.kernelPatches; [ grsecurity_nixos_kmod grsecurity_modinst ];
11210+ kernelPatches = [ self.kernelPatches.grsecurity_nixos_kmod ];
1121111211 extraConfig = callPackage ../os-specific/linux/kernel/grsecurity-nixos-config.nix { };
1121211212 };
1121311213