summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs/kerneldir_path.patch
blob: 7deda946821b9da840becdf2aee68c1b7b6894b8 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
diff -rc zfs-0.6.0-rc10.old/Makefile.in zfs-0.6.0-rc10/Makefile.in
*** zfs-0.6.0-rc10.old/Makefile.in	Tue Aug 14 12:35:34 2012
--- zfs-0.6.0-rc10/Makefile.in	Fri Aug 17 15:21:18 2012
***************
*** 1121,1127 ****
  
  @CONFIG_KERNEL_TRUE@install-data-local:
  @CONFIG_KERNEL_TRUE@	release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
! @CONFIG_KERNEL_TRUE@	instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \
  @CONFIG_KERNEL_TRUE@	for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
  @CONFIG_KERNEL_TRUE@		$(INSTALL) -D $$instfile $$instdest/$$instfile; \
  @CONFIG_KERNEL_TRUE@	done
--- 1121,1127 ----
  
  @CONFIG_KERNEL_TRUE@install-data-local:
  @CONFIG_KERNEL_TRUE@	release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
! @CONFIG_KERNEL_TRUE@	instdest=$(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION); \
  @CONFIG_KERNEL_TRUE@	for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
  @CONFIG_KERNEL_TRUE@		$(INSTALL) -D $$instfile $$instdest/$$instfile; \
  @CONFIG_KERNEL_TRUE@	done
diff -rc zfs-0.6.0-rc10.old/include/Makefile.in zfs-0.6.0-rc10/include/Makefile.in
*** zfs-0.6.0-rc10.old/include/Makefile.in	Tue Aug 14 12:35:32 2012
--- zfs-0.6.0-rc10/include/Makefile.in	Fri Aug 17 15:20:50 2012
***************
*** 402,408 ****
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs
  @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)
  @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  all: all-recursive
  
--- 402,408 ----
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs
  @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)
  @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  all: all-recursive
  
diff -rc zfs-0.6.0-rc10.old/include/linux/Makefile.in zfs-0.6.0-rc10/include/linux/Makefile.in
*** zfs-0.6.0-rc10.old/include/linux/Makefile.in	Tue Aug 14 12:35:32 2012
--- zfs-0.6.0-rc10/include/linux/Makefile.in	Fri Aug 17 15:20:53 2012
***************
*** 337,343 ****
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux
  @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux
  @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  all: all-am
  
--- 337,343 ----
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux
  @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/linux
  @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  all: all-am
  
diff -rc zfs-0.6.0-rc10.old/include/sys/Makefile.in zfs-0.6.0-rc10/include/sys/Makefile.in
*** zfs-0.6.0-rc10.old/include/sys/Makefile.in	Tue Aug 14 12:35:32 2012
--- zfs-0.6.0-rc10/include/sys/Makefile.in	Fri Aug 17 15:20:57 2012
***************
*** 590,596 ****
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys
  @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys
  @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  all: all-recursive
  
--- 590,596 ----
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys
  @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys
  @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  all: all-recursive
  
diff -rc zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in zfs-0.6.0-rc10/include/sys/fm/Makefile.in
*** zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in	Tue Aug 14 12:35:32 2012
--- zfs-0.6.0-rc10/include/sys/fm/Makefile.in	Fri Aug 17 15:21:00 2012
***************
*** 374,380 ****
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm
  @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm
  @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  all: all-recursive
  
--- 374,380 ----
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm
  @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm
  @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  all: all-recursive
  
diff -rc zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in
*** zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in	Tue Aug 14 12:35:32 2012
--- zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in	Fri Aug 17 15:21:03 2012
***************
*** 332,338 ****
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs
  @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs
  @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  all: all-am
  
--- 332,338 ----
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs
  @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm/fs
  @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  all: all-am
  
diff -rc zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fs/Makefile.in
*** zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in	Tue Aug 14 12:35:32 2012
--- zfs-0.6.0-rc10/include/sys/fs/Makefile.in	Fri Aug 17 15:21:06 2012
***************
*** 332,338 ****
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs
  @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs
  @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  all: all-am
  
--- 332,338 ----
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs
  @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H)
! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fs
  @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  all: all-am