diff options
Diffstat (limited to 'pkgs/os-specific/linux/spl')
-rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 16 | ||||
-rw-r--r-- | pkgs/os-specific/linux/spl/install_prefix.patch | 285 | ||||
-rw-r--r-- | pkgs/os-specific/linux/spl/install_prefix_2.patch | 32 | ||||
-rw-r--r-- | pkgs/os-specific/linux/spl/module_prefix.patch | 33 |
4 files changed, 277 insertions, 89 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 3d949511af0a..75ff28939722 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,27 +1,25 @@ { stdenv, fetchurl, kernelDev, perl, autoconf, automake, libtool, coreutils, gawk }: stdenv.mkDerivation { - name = "spl-0.6.0-rc14-${kernelDev.version}"; + name = "spl-0.6.1-${kernelDev.version}"; src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc14.tar.gz; - sha256 = "00wyamf13z8ins4s14xf0b3hfjfz4w084mr17hs3k5xifb5jxa8g"; + url = "http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.1.tar.gz"; + sha256 = "1bnianc00bkpdbcmignzqfv9yr8h6vj56wfl7lkhi9a5m5b3xakb"; }; - patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; + patches = [ ./install_prefix.patch ]; buildInputs = [ perl kernelDev autoconf automake libtool ]; - NIX_CFLAGS_COMPILE = "-I${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build/include/generated"; - preConfigure = '' ./autogen.sh - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid - substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod + substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid + substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" - substituteInPlace ./module/spl/spl-module.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" ''; configureFlags = '' diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch index 9a7393b7170c..6b3bd515bd05 100644 --- a/pkgs/os-specific/linux/spl/install_prefix.patch +++ b/pkgs/os-specific/linux/spl/install_prefix.patch @@ -1,19 +1,274 @@ -*** spl-0.6.0-rc10/Makefile.am.old Fri Aug 17 14:49:16 2012 ---- spl-0.6.0-rc10/Makefile.am Fri Aug 17 14:51:06 2012 +diff -rc spl-0.6.1.orig/include/fs/Makefile.am spl-0.6.1/include/fs/Makefile.am +*** spl-0.6.1.orig/include/fs/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/fs/Makefile.am 2013-04-05 22:10:41.436764000 -0700 *************** -*** 32,38 **** +*** 8,13 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + if CONFIG_KERNEL - install-data-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ - for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ - done ---- 32,38 ---- +! kerneldir = /usr/src/spl-$(VERSION)/include/fs + kernel_HEADERS = $(KERNEL_H) + endif +--- 8,13 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/fs + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/linux/Makefile.am spl-0.6.1/include/linux/Makefile.am +*** spl-0.6.1.orig/include/linux/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/linux/Makefile.am 2013-04-05 22:10:27.789139000 -0700 +*************** +*** 23,28 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/linux + kernel_HEADERS = $(KERNEL_H) + endif +--- 23,28 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/linux + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/Makefile.am spl-0.6.1/include/Makefile.am +*** spl-0.6.1.orig/include/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/Makefile.am 2013-04-05 22:10:45.108623000 -0700 +*************** +*** 16,21 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include + kernel_HEADERS = $(KERNEL_H) + endif +--- 16,21 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/rpc/Makefile.am spl-0.6.1/include/rpc/Makefile.am +*** spl-0.6.1.orig/include/rpc/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/rpc/Makefile.am 2013-04-05 22:11:08.724410000 -0700 +*************** +*** 9,14 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/rpc + kernel_HEADERS = $(KERNEL_H) + endif +--- 9,14 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/rpc + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/sharefs/Makefile.am spl-0.6.1/include/sharefs/Makefile.am +*** spl-0.6.1.orig/include/sharefs/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/sharefs/Makefile.am 2013-04-05 22:10:38.852722000 -0700 +*************** +*** 8,13 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/sharefs + kernel_HEADERS = $(KERNEL_H) + endif +--- 8,13 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/sharefs + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/sys/fm/Makefile.am spl-0.6.1/include/sys/fm/Makefile.am +*** spl-0.6.1.orig/include/sys/fm/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/sys/fm/Makefile.am 2013-04-05 22:10:59.964334000 -0700 +*************** +*** 9,14 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/sys/fm + kernel_HEADERS = $(KERNEL_H) + endif +--- 9,14 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/sys/fm + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/sys/fs/Makefile.am spl-0.6.1/include/sys/fs/Makefile.am +*** spl-0.6.1.orig/include/sys/fs/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/sys/fs/Makefile.am 2013-04-05 22:10:57.860366000 -0700 +*************** +*** 8,13 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + if CONFIG_KERNEL - install-data-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ - for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ +! kerneldir = /usr/src/spl-$(VERSION)/include/sys/fs + kernel_HEADERS = $(KERNEL_H) + endif +--- 8,13 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/sys/fs + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/sys/Makefile.am spl-0.6.1/include/sys/Makefile.am +*** spl-0.6.1.orig/include/sys/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/sys/Makefile.am 2013-04-05 22:11:05.788303000 -0700 +*************** +*** 104,110 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/sys + kernel_HEADERS = $(KERNEL_H) + endif + +--- 104,110 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/sys + kernel_HEADERS = $(KERNEL_H) + endif + +diff -rc spl-0.6.1.orig/include/sys/sysevent/Makefile.am spl-0.6.1/include/sys/sysevent/Makefile.am +*** spl-0.6.1.orig/include/sys/sysevent/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/sys/sysevent/Makefile.am 2013-04-05 22:10:54.364458000 -0700 +*************** +*** 8,13 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/sys/sysevent + kernel_HEADERS = $(KERNEL_H) + endif +--- 8,13 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/sys/sysevent + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/util/Makefile.am spl-0.6.1/include/util/Makefile.am +*** spl-0.6.1.orig/include/util/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/util/Makefile.am 2013-04-05 22:10:49.452569000 -0700 +*************** +*** 9,14 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/util + kernel_HEADERS = $(KERNEL_H) + endif +--- 9,14 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/util + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/include/vm/Makefile.am spl-0.6.1/include/vm/Makefile.am +*** spl-0.6.1.orig/include/vm/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/include/vm/Makefile.am 2013-04-05 22:10:47.444535000 -0700 +*************** +*** 10,15 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = /usr/src/spl-$(VERSION)/include/vm + kernel_HEADERS = $(KERNEL_H) + endif +--- 10,15 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + + if CONFIG_KERNEL +! kerneldir = @prefix@/libexec/spl/include/vm + kernel_HEADERS = $(KERNEL_H) + endif +diff -rc spl-0.6.1.orig/Makefile.am spl-0.6.1/Makefile.am +*** spl-0.6.1.orig/Makefile.am 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/Makefile.am 2013-04-05 22:09:52.429676000 -0700 +*************** +*** 9,18 **** + if CONFIG_KERNEL + SUBDIRS += module + +! extradir = /usr/src/spl-$(VERSION) + extra_HEADERS = spl.release.in spl_config.h.in + +! kerneldir = /usr/src/spl-$(VERSION)/$(LINUX_VERSION) + nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) + endif + +--- 9,18 ---- + if CONFIG_KERNEL + SUBDIRS += module + +! extradir = @prefix@/libexec/spl + extra_HEADERS = spl.release.in spl_config.h.in + +! kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION) + nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) + endif + +diff -rc spl-0.6.1.orig/module/Makefile.in spl-0.6.1/module/Makefile.in +*** spl-0.6.1.orig/module/Makefile.in 2013-03-26 09:37:39.000000000 -0700 +--- spl-0.6.1/module/Makefile.in 2013-03-28 10:21:59.093481000 -0700 +*************** +*** 21,41 **** + 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 +--- 21,41 ---- + 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/pkgs/os-specific/linux/spl/install_prefix_2.patch b/pkgs/os-specific/linux/spl/install_prefix_2.patch deleted file mode 100644 index 6068ad1d69c2..000000000000 --- a/pkgs/os-specific/linux/spl/install_prefix_2.patch +++ /dev/null @@ -1,32 +0,0 @@ -*** git-export/include/Makefile.am Tue Mar 6 00:05:28 2012 ---- git-export/include/Makefile.am.new Tue Mar 6 00:04:46 2012 -*************** -*** 16,22 **** - - install-data-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ - instfiles=`find . -name '*.h'`; \ - for instfile in $$instfiles; do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ ---- 16,22 ---- - - install-data-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ - instfiles=`find . -name '*.h'`; \ - for instfile in $$instfiles; do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ -*************** -*** 24,28 **** - - uninstall-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ - $(RM) -R $$instdest ---- 24,28 ---- - - uninstall-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ - $(RM) -R $$instdest diff --git a/pkgs/os-specific/linux/spl/module_prefix.patch b/pkgs/os-specific/linux/spl/module_prefix.patch deleted file mode 100644 index dd40711ccdb8..000000000000 --- a/pkgs/os-specific/linux/spl/module_prefix.patch +++ /dev/null @@ -1,33 +0,0 @@ -*** git-export/module/Makefile.in Wed Dec 31 16:00:01 1969 ---- git-export/module/Makefile.in.new Sat Jan 28 21:42:06 2012 -*************** -*** 17,30 **** - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ -! INSTALL_MOD_PATH=$(DESTDIR) \ - INSTALL_MOD_DIR=addon/spl $@ - @# Remove extraneous build products when packaging -! if [ -n "$(DESTDIR)" ]; then \ -! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \ - -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi ---- 17,30 ---- - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ -! INSTALL_MOD_PATH=@prefix@ \ - INSTALL_MOD_DIR=addon/spl $@ - @# Remove extraneous build products when packaging -! if [ -n "@prefix@" ]; then \ -! find @prefix@/lib/modules/@LINUX_VERSION@ \ - -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi |