zfs: 0.6.3 -> 0.6.4

1 files changed, 133 insertions, 214 deletions

diff --git a/pkgs/os-specific/linux/zfs/nix-build.patch b/pkgs/os-specific/linux/zfs/nix-build.patch
index af4b94e355d7..ae8e82f703af 100644
--- a/pkgs/os-specific/linux/zfs/nix-build.patch
+++ b/pkgs/os-specific/linux/zfs/nix-build.patch
@@ -1,214 +1,133 @@
-diff -rc zfs-0.6.1.orig/include/linux/Makefile.am zfs-0.6.1/include/linux/Makefile.am
-*** zfs-0.6.1.orig/include/linux/Makefile.am	2013-03-26 09:37:47.000000000 -0700
---- zfs-0.6.1/include/linux/Makefile.am	2013-03-28 11:07:10.099129000 -0700
-***************
-*** 16,21 ****
-  endif
-  
-  if CONFIG_KERNEL
-! kerneldir = /usr/src/zfs-$(VERSION)/include/linux
-  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
-  endif
---- 16,21 ----
-  endif
-  
-  if CONFIG_KERNEL
-! kerneldir = @prefix@/include/linux
-  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
-  endif
-diff -rc zfs-0.6.1.orig/include/Makefile.am zfs-0.6.1/include/Makefile.am
-*** zfs-0.6.1.orig/include/Makefile.am	2013-03-26 09:37:47.000000000 -0700
---- zfs-0.6.1/include/Makefile.am	2013-03-28 11:07:38.810870000 -0700
-***************
-*** 28,33 ****
-  endif
-  
-  if CONFIG_KERNEL
-! kerneldir = /usr/src/zfs-$(VERSION)/include
-  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
-  endif
---- 28,33 ----
-  endif
-  
-  if CONFIG_KERNEL
-! kerneldir = @prefix@/include
-  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
-  endif
-diff -rc zfs-0.6.1.orig/include/sys/fm/fs/Makefile.am zfs-0.6.1/include/sys/fm/fs/Makefile.am
-*** zfs-0.6.1.orig/include/sys/fm/fs/Makefile.am	2013-03-26 09:37:47.000000000 -0700
---- zfs-0.6.1/include/sys/fm/fs/Makefile.am	2013-03-28 11:07:36.074756000 -0700
-***************
-*** 13,18 ****
-  endif
-  
-  if CONFIG_KERNEL
-! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm/fs
-  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
-  endif
---- 13,18 ----
-  endif
-  
-  if CONFIG_KERNEL
-! kerneldir = @prefix@/include/sys/fm/fs
-  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
-  endif
-diff -rc zfs-0.6.1.orig/include/sys/fm/Makefile.am zfs-0.6.1/include/sys/fm/Makefile.am
-*** zfs-0.6.1.orig/include/sys/fm/Makefile.am	2013-03-26 09:37:47.000000000 -0700
---- zfs-0.6.1/include/sys/fm/Makefile.am	2013-03-28 11:07:32.265896000 -0700
-***************
-*** 16,21 ****
-  endif
-  
-  if CONFIG_KERNEL
-! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm
-  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
-  endif
---- 16,21 ----
-  endif
-  
-  if CONFIG_KERNEL
-! kerneldir = @prefix@/include/sys/fm
-  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
-  endif
-diff -rc zfs-0.6.1.orig/include/sys/fs/Makefile.am zfs-0.6.1/include/sys/fs/Makefile.am
-*** zfs-0.6.1.orig/include/sys/fs/Makefile.am	2013-03-26 09:37:47.000000000 -0700
---- zfs-0.6.1/include/sys/fs/Makefile.am	2013-03-28 11:07:27.592339000 -0700
-***************
-*** 13,18 ****
-  endif
-  
-  if CONFIG_KERNEL
-! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fs
-  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
-  endif
---- 13,18 ----
-  endif
-  
-  if CONFIG_KERNEL
-! kerneldir = @prefix@/include/sys/fs
-  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
-  endif
-diff -rc zfs-0.6.1.orig/include/sys/Makefile.am zfs-0.6.1/include/sys/Makefile.am
-*** zfs-0.6.1.orig/include/sys/Makefile.am	2013-03-26 09:37:47.000000000 -0700
---- zfs-0.6.1/include/sys/Makefile.am	2013-03-28 11:07:19.045717000 -0700
-***************
-*** 91,96 ****
-  endif
-  
-  if CONFIG_KERNEL
-! kerneldir = /usr/src/zfs-$(VERSION)/include/sys
-  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
-  endif
---- 91,96 ----
-  endif
-  
-  if CONFIG_KERNEL
-! kerneldir = @prefix@/include/sys
-  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
-  endif
-diff -rc zfs-0.6.1.orig/Makefile.am zfs-0.6.1/Makefile.am
-*** zfs-0.6.1.orig/Makefile.am	2013-03-26 09:37:47.000000000 -0700
---- zfs-0.6.1/Makefile.am	2013-04-05 23:49:39.763623000 -0700
-***************
-*** 9,18 ****
-  if CONFIG_KERNEL
-  SUBDIRS += module
-  
-! extradir = /usr/src/zfs-$(VERSION)
-  extra_HEADERS = zfs.release.in zfs_config.h.in
-  
-! kerneldir = /usr/src/zfs-$(VERSION)/$(LINUX_VERSION)
-  nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
-  endif
-  
---- 9,18 ----
-  if CONFIG_KERNEL
-  SUBDIRS += module
-  
-! extradir = @prefix@/libexec/zfs-$(VERSION)
-  extra_HEADERS = zfs.release.in zfs_config.h.in
-  
-! kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION)
-  nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
-  endif
-  
-diff -rc zfs-0.6.1.orig/module/Makefile.in zfs-0.6.1/module/Makefile.in
-*** zfs-0.6.1.orig/module/Makefile.in	2013-03-26 09:37:47.000000000 -0700
---- zfs-0.6.1/module/Makefile.in	2013-04-05 23:50:41.497876000 -0700
-***************
-*** 18,26 ****
-  	@# installed devel headers, or they may be in the module
-  	@# subdirectory when building against the spl source tree.
-  	@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
-! 		/bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
-  	elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
-! 		/bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
-  	else \
-  		echo -e "\n" \
-  		"*** Missing spl symbols ensure you have built the spl:\n" \
---- 18,26 ----
-  	@# installed devel headers, or they may be in the module
-  	@# subdirectory when building against the spl source tree.
-  	@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
-! 		cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
-  	elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
-! 		cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
-  	else \
-  		echo -e "\n" \
-  		"*** Missing spl symbols ensure you have built the spl:\n" \
-***************
-*** 28,33 ****
---- 28,35 ----
-  		"*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
-  		exit 1; \
-  	fi
-+ 	@# when copying a file out of the nix store, we need to make it writable again. 
-+ 	chmod +w @SPL_SYMBOLS@
-  	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
-  
-  clean:
-***************
-*** 42,62 ****
-  modules_install:
-  	@# Install the kernel modules
-  	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
-! 		INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
-  		INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)
-  	@# Remove extraneous build products when packaging
-! 	kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
-  	if [ -n $$kmoddir ]; then \
-  		find $$kmoddir -name 'modules.*' | xargs $(RM); \
-  	fi
-! 	sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
-  	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@
-  	list='$(subdir-m)'; for subdir in $$list; do \
-  		$(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \
-  	done
---- 44,64 ----
-  modules_install:
-  	@# Install the kernel modules
-  	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
-! 		INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
-  		INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)
-  	@# Remove extraneous build products when packaging
-! 	kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
-  	if [ -n $$kmoddir ]; then \
-  		find $$kmoddir -name 'modules.*' | xargs $(RM); \
-  	fi
-! 	sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
-  	if [ -f $$sysmap ]; then \
-  		depmod -ae -F $$sysmap @LINUX_VERSION@; \
-  	fi
-  
-  modules_uninstall:
-  	@# Uninstall the kernel modules
-! 	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
+diff --git a/Makefile.am b/Makefile.am
+index 49b417a..f4af44d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,10 +12,10 @@ endif
+ if CONFIG_KERNEL
+ SUBDIRS += module
+ 
+-extradir = @prefix@/src/zfs-$(VERSION)
++extradir = @prefix@/libexec/zfs-$(VERSION)
+ extra_HEADERS = zfs.release.in zfs_config.h.in
+ 
+-kerneldir = @prefix@/src/zfs-$(VERSION)/$(LINUX_VERSION)
++kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION)
+ nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
+ endif
+ 
+diff --git a/include/Makefile.am b/include/Makefile.am
+index a94cad5..a160fe2 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -29,6 +29,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+ endif
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/zfs-$(VERSION)/include
++kerneldir = @prefix@/include
+ kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+ endif
+diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
+index d00b1c8..3242d2e 100644
+--- a/include/linux/Makefile.am
++++ b/include/linux/Makefile.am
+@@ -17,6 +17,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+ endif
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux
++kerneldir = @prefix@/include/linux
+ kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+ endif
+diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
+index 7ddace0..8da3870 100644
+--- a/include/sys/Makefile.am
++++ b/include/sys/Makefile.am
+@@ -102,6 +102,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+ endif
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
++kerneldir = @prefix@/include/sys
+ kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+ endif
+diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
+index 8bca5d8..a5eafcd 100644
+--- a/include/sys/fm/Makefile.am
++++ b/include/sys/fm/Makefile.am
+@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+ endif
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm
++kerneldir = @prefix@/include/sys/fm
+ kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+ endif
+diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am
+index fdc9eb5..807c47c 100644
+--- a/include/sys/fm/fs/Makefile.am
++++ b/include/sys/fm/fs/Makefile.am
+@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+ endif
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs
++kerneldir = @prefix@/include/sys/fm/fs
+ kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+ endif
+diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
+index 0859b9f..b0c6eec 100644
+--- a/include/sys/fs/Makefile.am
++++ b/include/sys/fs/Makefile.am
+@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+ endif
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fs
++kerneldir = @prefix@/include/sys/fs
+ kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+ endif
+diff --git a/module/Makefile.in b/module/Makefile.in
+index 686402b..9cbf598 100644
+--- a/module/Makefile.in
++++ b/module/Makefile.in
+@@ -18,9 +18,9 @@ modules:
+ 	@# installed devel headers, or they may be in the module
+ 	@# subdirectory when building against the spl source tree.
+ 	@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
+-		/bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
++		cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
+ 	elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
+-		/bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
++		cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
+ 	else \
+ 		echo -e "\n" \
+ 		"*** Missing spl symbols ensure you have built the spl:\n" \
+@@ -28,6 +28,8 @@ modules:
+ 		"*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
+ 		exit 1; \
+ 	fi
++	@# when copying a file out of the nix store, we need to make it writable again. 
++	chmod +w @SPL_SYMBOLS@
+ 	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
+ 
+ clean:
+@@ -42,15 +44,15 @@ clean:
+ modules_install:
+ 	@# Install the kernel modules
+ 	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
+-		INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
++		INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
+ 		INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
+ 		KERNELRELEASE=@LINUX_VERSION@
+ 	@# Remove extraneous build products when packaging
+-	kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
++	kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
+ 	if [ -n $$kmoddir ]; then \
+ 		find $$kmoddir -name 'modules.*' | xargs $(RM); \
+ 	fi
+-	sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
++	sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
+ 	if [ -f $$sysmap ]; then \
+ 		depmod -ae -F $$sysmap @LINUX_VERSION@; \
+ 	fi