spl-0.6.1, zfs-0.6.1
This commit is contained in:
Jack Cummings
parent
98ba667094
commit
d1cb67a629
@ -1,13 +1,13 @@
|
||||
{ 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 ];
|
||||
|
||||
@ -16,12 +16,12 @@ stdenv.mkDerivation {
|
||||
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 = ''
|
||||
|
||||
@ -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
|
||||
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 = @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
|
||||
! 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
|
||||
|
||||
@ -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
|
||||
@ -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
|
||||
@ -1,20 +1,19 @@
|
||||
{ stdenv, fetchurl, kernelDev, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "zfs-0.6.0-rc14-${kernelDev.version}";
|
||||
name = "zfs-0.6.1-${kernelDev.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc14.tar.gz;
|
||||
sha256 = "0ny2lbhyfsfwfcasa1iv2hz12hzcskx9mv641955d844dh32z9fg";
|
||||
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.1.tar.gz;
|
||||
sha256 = "1ykph9d4p70mam6lvcx0zld6d34gch15dsilds5ncbxh0m52knl0";
|
||||
};
|
||||
|
||||
patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ];
|
||||
patches = [ ./mount_zfs_prefix.patch ./kerneldir_path.patch ];
|
||||
|
||||
buildInputs = [ kernelDev spl perl autoconf automake libtool zlib libuuid coreutils ];
|
||||
|
||||
# for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
|
||||
NIX_CFLAGS_LINK = "-lgcc_s";
|
||||
NIX_CFLAGS_COMPILE = "-I${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build/include/generated";
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
@ -31,8 +30,7 @@ stdenv.mkDerivation {
|
||||
configureFlags = ''
|
||||
--with-linux=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build
|
||||
--with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build
|
||||
--with-spl=${spl}/libexec/spl/${kernelDev.modDirVersion}
|
||||
${if stdenv.system == "i686-linux" then "--enable-atomic-spinlocks" else ""}
|
||||
--with-spl=${spl}/libexec/spl
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,85 +1,214 @@
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 9ffd6be..8e51412 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -34,7 +34,7 @@ distclean-local::
|
||||
if CONFIG_KERNEL
|
||||
install-data-local:
|
||||
release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
|
||||
- instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \
|
||||
+ instdest=$(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION); \
|
||||
for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
|
||||
$(INSTALL) -D $$instfile $$instdest/$$instfile; \
|
||||
done
|
||||
diff --git a/include/Makefile.am b/include/Makefile.am
|
||||
index 8f9c8d7..5fc44d5 100644
|
||||
--- a/include/Makefile.am
|
||||
+++ b/include/Makefile.am
|
||||
@@ -27,6 +27,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
|
||||
endif
|
||||
|
||||
if CONFIG_KERNEL
|
||||
-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)
|
||||
+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
|
||||
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
|
||||
endif
|
||||
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
|
||||
index 6e481a1..1107809 100644
|
||||
--- a/include/linux/Makefile.am
|
||||
+++ b/include/linux/Makefile.am
|
||||
@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
|
||||
endif
|
||||
|
||||
if CONFIG_KERNEL
|
||||
-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux
|
||||
+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
|
||||
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
|
||||
endif
|
||||
diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
|
||||
index 651e68b..b80bb55 100644
|
||||
--- a/include/sys/Makefile.am
|
||||
+++ b/include/sys/Makefile.am
|
||||
@@ -89,6 +89,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
|
||||
endif
|
||||
|
||||
if CONFIG_KERNEL
|
||||
-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys
|
||||
+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
|
||||
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
|
||||
endif
|
||||
diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
|
||||
index 900ed93..8d9bed2 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 = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm
|
||||
+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
|
||||
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
|
||||
endif
|
||||
diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am
|
||||
index d82d076..b4ae3ee 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 = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs
|
||||
+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
|
||||
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
|
||||
endif
|
||||
diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
|
||||
index b702679..3c747f4 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 = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs
|
||||
+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
|
||||
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
|
||||
endif
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user