From 4c37edd6f3b6ec6e586539e61d3395307196b843 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sat, 6 Apr 2013 00:06:27 -0700 Subject: Don't need NIX_CFLAGS_COMPILE in spl build anymore, consolodate zfs patches. --- pkgs/os-specific/linux/zfs/nix-build.patch | 214 +++++++++++++++++++++++++++++ 1 file changed, 214 insertions(+) create mode 100644 pkgs/os-specific/linux/zfs/nix-build.patch (limited to 'pkgs/os-specific/linux/zfs/nix-build.patch') diff --git a/pkgs/os-specific/linux/zfs/nix-build.patch b/pkgs/os-specific/linux/zfs/nix-build.patch new file mode 100644 index 000000000000..af4b94e355d7 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/nix-build.patch @@ -0,0 +1,214 @@ +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 -- cgit 1.4.1