diff options
Diffstat (limited to 'pkgs/os-specific/linux/spl')
| -rw-r--r-- | pkgs/os-specific/linux/spl/const.patch | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/spl/install_prefix.patch | 17 |
3 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/spl/const.patch b/pkgs/os-specific/linux/spl/const.patch index 3bfcaa22b13..932e8a9eb1c 100644 --- a/pkgs/os-specific/linux/spl/const.patch +++ b/pkgs/os-specific/linux/spl/const.patch @@ -1,10 +1,10 @@ diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c -index f25239a..b731123 100644 +index eb00505..6f38cef 100644 --- a/module/spl/spl-proc.c +++ b/module/spl/spl-proc.c -@@ -38,7 +38,7 @@ - - #define SS_DEBUG_SUBSYS SS_PROC +@@ -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) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index b8aad109c5a..959523ec597 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -17,13 +17,13 @@ assert buildKernel -> kernel != null; stdenv.mkDerivation rec { name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.6.5.3"; + version = "0.6.5.4"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "0lj57apwsy8cfwsvg9z62k71r3qms2p87lgcdk54g7352cwziqps"; + sha256 = "0k80xvl15ahbs0mylfl2bd5widxhngpf7dl6zq46s21wk0795jl4"; }; patches = [ ./const.patch ./install_prefix.patch ]; diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch index 0f12f531f7a..dc91392bd2f 100644 --- a/pkgs/os-specific/linux/spl/install_prefix.patch +++ b/pkgs/os-specific/linux/spl/install_prefix.patch @@ -1,5 +1,5 @@ diff --git a/Makefile.am b/Makefile.am -index 89af931..674420c 100644 +index 4977448..ac17217 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,10 +12,10 @@ endif @@ -40,10 +40,10 @@ index e0da4b3..d6d7af0 100644 kernel_HEADERS = $(KERNEL_H) endif diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index 1cca44a..e0d843b 100644 +index 712e94e..4af9fb7 100644 --- a/include/linux/Makefile.am +++ b/include/linux/Makefile.am -@@ -19,6 +19,6 @@ USER_H = +@@ -18,6 +18,6 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) if CONFIG_KERNEL @@ -76,10 +76,10 @@ index 10e7093..febecdf 100644 kernel_HEADERS = $(KERNEL_H) endif diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am -index 2d21c57..3958cfd 100644 +index 73c4a84..31a9f50 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am -@@ -104,7 +104,7 @@ USER_H = +@@ -107,7 +107,7 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) if CONFIG_KERNEL @@ -125,7 +125,7 @@ index 63d9af3..de1aa18 100644 kernel_HEADERS = $(KERNEL_H) endif diff --git a/include/util/Makefile.am b/include/util/Makefile.am -index b721b50..cbb9a05 100644 +index e2bf09f..3f5d6ce 100644 --- a/include/util/Makefile.am +++ b/include/util/Makefile.am @@ -9,6 +9,6 @@ USER_H = @@ -149,7 +149,7 @@ index 7faab0a..8148b3d 100644 kernel_HEADERS = $(KERNEL_H) endif diff --git a/module/Makefile.in b/module/Makefile.in -index 41c1010..3141397 100644 +index d4e62e1..73fa01c 100644 --- a/module/Makefile.in +++ b/module/Makefile.in @@ -21,15 +21,15 @@ clean: @@ -162,8 +162,9 @@ index 41c1010..3141397 100644 KERNELRELEASE=@LINUX_VERSION@ @# Remove extraneous build products when packaging - kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ +- if [ -n "$(DESTDIR)" ]; then \ + kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ - if [ -n $$kmoddir ]; then \ ++ if [ -n "@prefix@" ]; then \ find $$kmoddir -name 'modules.*' | xargs $(RM); \ fi - sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ |