summary refs log tree commit diff
path: root/pkgs/os-specific/linux/spl/install_prefix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/os-specific/linux/spl/install_prefix.patch')
-rw-r--r--pkgs/os-specific/linux/spl/install_prefix.patch447
1 files changed, 173 insertions, 274 deletions
diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch
index 6b3bd515bd0..0f12f531f7a 100644
--- a/pkgs/os-specific/linux/spl/install_prefix.patch
+++ b/pkgs/os-specific/linux/spl/install_prefix.patch
@@ -1,274 +1,173 @@
-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
-***************
-*** 8,13 ****
-  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
-  
-  if CONFIG_KERNEL
-! 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
-! 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/Makefile.am b/Makefile.am
+index 89af931..674420c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,10 +12,10 @@ endif
+ if CONFIG_KERNEL
+ SUBDIRS += module
+ 
+-extradir = @prefix@/src/spl-$(VERSION)
++extradir = @prefix@/libexec/spl
+ extra_HEADERS = spl.release.in spl_config.h.in
+ 
+-kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION)
++kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION)
+ nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)
+ endif
+ 
+diff --git a/include/Makefile.am b/include/Makefile.am
+index 3200222..4a47aaa 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -13,6 +13,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include
++kerneldir = @prefix@/libexec/spl/include
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am
+index e0da4b3..d6d7af0 100644
+--- a/include/fs/Makefile.am
++++ b/include/fs/Makefile.am
+@@ -8,6 +8,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/fs
++kerneldir = @prefix@/libexec/spl/include/fs
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
+index 1cca44a..e0d843b 100644
+--- a/include/linux/Makefile.am
++++ b/include/linux/Makefile.am
+@@ -19,6 +19,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/linux
++kerneldir = @prefix@/libexec/spl/include/linux
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am
+index cfc8246..4fbd33d 100644
+--- a/include/rpc/Makefile.am
++++ b/include/rpc/Makefile.am
+@@ -9,6 +9,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc
++kerneldir = @prefix@/libexec/spl/include/rpc
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am
+index 10e7093..febecdf 100644
+--- a/include/sharefs/Makefile.am
++++ b/include/sharefs/Makefile.am
+@@ -8,6 +8,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs
++kerneldir = @prefix@/libexec/spl/include/sharefs
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
+index 2d21c57..3958cfd 100644
+--- a/include/sys/Makefile.am
++++ b/include/sys/Makefile.am
+@@ -104,7 +104,7 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys
++kerneldir = @prefix@/libexec/spl/include/sys
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+ 
+diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
+index 2821cbe..a84ce8e 100644
+--- a/include/sys/fm/Makefile.am
++++ b/include/sys/fm/Makefile.am
+@@ -9,6 +9,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm
++kerneldir = @prefix@/libexec/spl/include/sys/fm
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
+index 581083e..0c35fb7 100644
+--- a/include/sys/fs/Makefile.am
++++ b/include/sys/fs/Makefile.am
+@@ -8,6 +8,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs
++kerneldir = @prefix@/libexec/spl/include/sys/fs
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am
+index 63d9af3..de1aa18 100644
+--- a/include/sys/sysevent/Makefile.am
++++ b/include/sys/sysevent/Makefile.am
+@@ -8,6 +8,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent
++kerneldir = @prefix@/libexec/spl/include/sys/sysevent
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/util/Makefile.am b/include/util/Makefile.am
+index b721b50..cbb9a05 100644
+--- a/include/util/Makefile.am
++++ b/include/util/Makefile.am
+@@ -9,6 +9,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/util
++kerneldir = @prefix@/libexec/spl/include/util
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am
+index 7faab0a..8148b3d 100644
+--- a/include/vm/Makefile.am
++++ b/include/vm/Makefile.am
+@@ -10,6 +10,6 @@ USER_H =
+ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+ 
+ if CONFIG_KERNEL
+-kerneldir = @prefix@/src/spl-$(VERSION)/include/vm
++kerneldir = @prefix@/libexec/spl/include/vm
+ kernel_HEADERS = $(KERNEL_H)
+ endif
+diff --git a/module/Makefile.in b/module/Makefile.in
+index 41c1010..3141397 100644
+--- a/module/Makefile.in
++++ b/module/Makefile.in
+@@ -21,15 +21,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
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-29 23:42:43 +0000