diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index d8714d9c1729..bf435cc862c1 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk - +, fetchpatch # Kernel dependencies , kernel }: @@ -10,13 +10,13 @@ assert kernel != null; stdenv.mkDerivation rec { name = "spl-${version}-${kernel.version}"; - version = "0.7.12"; + version = "0.7.13"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "13zqh1g132g63zv54l3bsg5kras9mllkx9wvlnfs13chfr7vpp4p"; + sha256 = "1rzqgiszy8ad2gx20577azp1y5jgad0907slfzl5y2zb05jgaipa"; }; patches = [ ./install_prefix.patch ]; diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch index 114ca1231470..566aab828ef7 100644 --- a/pkgs/os-specific/linux/spl/install_prefix.patch +++ b/pkgs/os-specific/linux/spl/install_prefix.patch @@ -136,14 +136,12 @@ index 7faab0a..8148b3d 100644 +kerneldir = @prefix@/libexec/spl/include/vm kernel_HEADERS = $(KERNEL_H) endif -diff --git a/module/Makefile.in b/module/Makefile.in -index d4e62e1..73fa01c 100644 --- a/module/Makefile.in +++ b/module/Makefile.in -@@ -21,15 +21,15 @@ clean: +@@ -21,22 +21,22 @@ modules_install: @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ + $(MAKE) -C @LINUX_OBJ@ M=`pwd` $@ \ - INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ + INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ @@ -160,3 +158,11 @@ index d4e62e1..73fa01c 100644 if [ -f $$sysmap ]; then \ depmod -ae -F $$sysmap @LINUX_VERSION@; \ fi + + modules_uninstall: + @# Uninstall the kernel modules +- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ ++ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ + list='$(subdir-m)'; for subdir in $$list; do \ + $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ + done