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

spl: Fix compilation with grsecurity's constify plugin and kernels < 3.8

Browse source
This commit is contained in:
Ricardo M. Correia 2013-11-13 21:19:10 +01:00
parent 8d5ce245a2
commit 1c2aacb5d8
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/os-specific/linux/spl/const.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
index f25239a..b731123 100644
--- a/module/spl/spl-proc.c
+++ b/module/spl/spl-proc.c
@@ -38,7 +38,7 @@
#define SS_DEBUG_SUBSYS SS_PROC
-#if defined(CONSTIFY_PLUGIN) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
+#if defined(CONSTIFY_PLUGIN)
typedef struct ctl_table __no_const spl_ctl_table;
#else
typedef struct ctl_table spl_ctl_table;

4
pkgs/os-specific/linux/spl/default.nix
View file

@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "196scl8q0bkkak6m0p1l1fz254cgsizqm73bf9wk3iynamq7qmrw";
};
patches = [ ./install_prefix.patch ./3_12-compat.patch ./3_13-compat-1.patch ./3_13-compat-2.patch ];
patches = [ ./install_prefix.patch ./3_12-compat.patch ./3_13-compat-1.patch ./3_13-compat-2.patch ./const.patch ];
buildInputs = [ perl autoconf automake libtool ];
@ -34,7 +34,7 @@ stdenv.mkDerivation {
longDescription = ''
This kernel module is a porting layer for ZFS to work inside the linux
kernel.
kernel.
'';
homepage = http://zfsonlinux.org/;