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

zfs, spl: 0.7.6 -> 0.7.7

Browse Source 
Remove spl patch that was introduced for grsecurity which we don't support
anymore. ZFS now needs perl for some scripts that are call in the configure
script.
This commit is contained in:
Franz Pletz 2018-03-21 18:56:24 +01:00
parent ab5f98a77e
commit f744f83072
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +0,0 @@
diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
index eb00505..6f38cef 100644
--- a/module/spl/spl-proc.c
+++ b/module/spl/spl-proc.c
@@ -36,7 +36,7 @@
#include <linux/uaccess.h>
#include <linux/version.h>
-#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;

6
pkgs/os-specific/linux/spl/default.nix
View File

@ -20,7 +20,7 @@ let
inherit rev sha256;
};
patches = [ ./const.patch ./install_prefix.patch ];
patches = [ ./install_prefix.patch ];
nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies;
@ -61,8 +61,8 @@ in
assert kernel != null;
{
splStable = common {
version = "0.7.6";
sha256 = "1l641d89k48ngmarx9mxh8gw2zzrf7fw7n8zmslhz4h1152plddb";
version = "0.7.7";
sha256 = "0mq7827x4173wdbpj361gvxvk8j9r96363gka75smzsc31i2wa5x";
};
splUnstable = common {

13
pkgs/os-specific/linux/zfs/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils, fetchpatch
{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils
, perl, fetchpatch
, configFile ? "all"
# Userspace dependencies
@ -39,8 +40,12 @@ let
patches = extraPatches;
postPatch = optionalString buildKernel ''
patchShebangs scripts
'';
nativeBuildInputs = [ autoreconfHook nukeReferences ]
++ optional buildKernel kernel.moduleBuildDependencies;
++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]);
buildInputs =
optionals buildKernel [ spl ]
++ optionals buildUser [ zlib libuuid python attr ]
@ -142,9 +147,9 @@ in {
incompatibleKernelVersion = null;
# this package should point to the latest release.
version = "0.7.6";
version = "0.7.7";
sha256 = "1k3a69zfdk4ia4z2l69lbz0mj26bwdanxd2wynkdpm2kl3zjj18h";
sha256 = "0lrzy27sh1cinkf04ki2vfjrgpgbiza2s59i2by45qdd8kmkcc5r";
extraPatches = [
(fetchpatch {