ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 08:59:32 +03:00
Code Issues Projects Releases Wiki Activity

spl: 0.7.12 -> 0.7.13

Browse Source
This commit is contained in:
Jörg Thalheim 2019-03-05 14:58:51 +00:00
parent 2bfd19fcb2
commit 6b36c711a9
No known key found for this signature in database
GPG Key ID: B3F5D81B0C6967C4
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk { fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk
, fetchpatch
# Kernel dependencies # Kernel dependencies
, kernel , kernel
}: }:
@ -10,13 +10,13 @@ assert kernel != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "spl-${version}-${kernel.version}"; name = "spl-${version}-${kernel.version}";
version = "0.7.12"; version = "0.7.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zfsonlinux"; owner = "zfsonlinux";
repo = "spl"; repo = "spl";
rev = "spl-${version}"; rev = "spl-${version}";
sha256 = "13zqh1g132g63zv54l3bsg5kras9mllkx9wvlnfs13chfr7vpp4p"; sha256 = "1rzqgiszy8ad2gx20577azp1y5jgad0907slfzl5y2zb05jgaipa";
}; };
patches = [ ./install_prefix.patch ]; patches = [ ./install_prefix.patch ];

14
pkgs/os-specific/linux/spl/install_prefix.patch
View File

@ -136,14 +136,12 @@ index 7faab0a..8148b3d 100644
+kerneldir = @prefix@/libexec/spl/include/vm +kerneldir = @prefix@/libexec/spl/include/vm
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif
diff --git a/module/Makefile.in b/module/Makefile.in
index d4e62e1..73fa01c 100644
--- a/module/Makefile.in --- a/module/Makefile.in
+++ b/module/Makefile.in +++ b/module/Makefile.in
@@ -21,15 +21,15 @@ clean: @@ -21,22 +21,22 @@
modules_install: modules_install:
@# Install the kernel modules @# 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=$(DESTDIR)$(INSTALL_MOD_PATH) \
+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ + INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
@ -160,3 +158,11 @@ index d4e62e1..73fa01c 100644
if [ -f $$sysmap ]; then \ if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \ depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi 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