1 |
commit: df1cc0f5f518b877bc29d7b0fa15456203041d0f |
2 |
Author: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 8 23:06:32 2018 +0000 |
4 |
Commit: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 8 23:27:49 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df1cc0f5 |
7 |
|
8 |
sys-fs/zfs: Fixing bugs #639350 and #642110 |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
sys-fs/zfs-kmod/Manifest | 1 - |
13 |
sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild | 8 +- |
14 |
sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild | 8 +- |
15 |
sys-fs/zfs-kmod/zfs-kmod-0.7.3.ebuild | 144 --------------- |
16 |
sys-fs/zfs-kmod/zfs-kmod-0.7.5.ebuild | 8 +- |
17 |
sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 6 +- |
18 |
sys-fs/zfs/Manifest | 1 - |
19 |
...{zfs-0.6.5.11.ebuild => zfs-0.6.5.11-r1.ebuild} | 5 +- |
20 |
...zfs-0.6.5.4-r2.ebuild => zfs-0.6.5.4-r3.ebuild} | 5 +- |
21 |
sys-fs/zfs/zfs-0.7.3.ebuild | 201 --------------------- |
22 |
.../zfs/{zfs-0.7.5.ebuild => zfs-0.7.5-r1.ebuild} | 5 +- |
23 |
sys-fs/zfs/zfs-9999.ebuild | 3 +- |
24 |
sys-kernel/spl/Manifest | 1 - |
25 |
sys-kernel/spl/spl-0.6.5.11.ebuild | 8 +- |
26 |
sys-kernel/spl/spl-0.6.5.4-r1.ebuild | 8 +- |
27 |
sys-kernel/spl/spl-0.7.3.ebuild | 110 ----------- |
28 |
sys-kernel/spl/spl-0.7.5.ebuild | 8 +- |
29 |
sys-kernel/spl/spl-9999.ebuild | 6 +- |
30 |
18 files changed, 49 insertions(+), 487 deletions(-) |
31 |
|
32 |
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest |
33 |
index 1a7bcc59d61..a6cca4775d2 100644 |
34 |
--- a/sys-fs/zfs-kmod/Manifest |
35 |
+++ b/sys-fs/zfs-kmod/Manifest |
36 |
@@ -1,5 +1,4 @@ |
37 |
DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 |
38 |
DIST zfs-0.6.5.4-patches-p1.tar.xz 64004 BLAKE2B e9db3c1bde3a2636b35a4204c484bc4cec0968278519762707849ba138eeb9128130de70c2f40bb28dc9102347465d724a60cebd45ddb12d4217739ecbed7714 SHA512 9203356b43bdad2ed78c946af8c95c9fc4d2996b41a09a3b1f5a8657d2742ac69d10b4a87d443db497d591878cf7a70ebb19762b0df135ee25f4e8d2ed6ad71f |
39 |
DIST zfs-0.6.5.4.tar.gz 2506470 BLAKE2B 10a2242081891b94a7863f11b4c3b9e443d3b75b5eb03e8fc88e30484a94555203dec8964075cf23f694777dd699e20acb1a52b5d04cba410b6df84512436e08 SHA512 90c87cd95fd06cf34755358e7cc4053d19f351316133f0b808e7585a3fc8f82e7c0f49072c2995d0520de5104fd04d91a166a0d5b6c923c82dfb2fb4f7f57a01 |
40 |
-DIST zfs-0.7.3.tar.gz 6393145 BLAKE2B ed384306cdee1ff5450e45981bbb19e7f399a637f2c08ee1c31ab155f8ca9e7b6526ca9241e1aa8ae9aa55d51898d3525d149027e68ce2c454f9fafb44badfcf SHA512 fe116fd787050f7bc099fe3ed5335c2d18711e5e665af5be13b3971939258e036e273432e80106e704f037d1f6e3114b12e26b01f97b575723f8bd46acdcbf61 |
41 |
DIST zfs-0.7.5.tar.gz 6403102 BLAKE2B 5159b2ab811b2f7bcbbc708814e07e68b0b38d7b5fca4a82205c7bb4332155121f1385f2cd3a6b7acb6bd64d13b9ad2af85d42b90623efb0f33a2f542fb90803 SHA512 3512aaa6225f74323f2d14e029a113593e0cf44be2ab18cc42dcb82d237b88843ccd7e48ed73a4c6f6da574151c1af461e0528725e11bcb42280467e37f63df2 |
42 |
|
43 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild |
44 |
index ddbb09881e7..680b00083e5 100644 |
45 |
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild |
46 |
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild |
47 |
@@ -1,4 +1,4 @@ |
48 |
-# Copyright 1999-2017 Gentoo Foundation |
49 |
+# Copyright 1999-2018 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
|
52 |
EAPI="5" |
53 |
@@ -10,7 +10,7 @@ if [ ${PV} == "9999" ]; then |
54 |
else |
55 |
SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" |
56 |
S="${WORKDIR}/zfs-${PV}" |
57 |
- KEYWORDS=" ~amd64" |
58 |
+ KEYWORDS="~amd64" |
59 |
fi |
60 |
|
61 |
inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils |
62 |
@@ -40,7 +40,9 @@ DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) |
63 |
|
64 |
pkg_setup() { |
65 |
linux-info_pkg_setup |
66 |
- CONFIG_CHECK="!DEBUG_LOCK_ALLOC |
67 |
+ CONFIG_CHECK=" |
68 |
+ !DEBUG_LOCK_ALLOC |
69 |
+ !CONFIG_REISER4_FS |
70 |
EFI_PARTITION |
71 |
IOSCHED_NOOP |
72 |
MODULES |
73 |
|
74 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild |
75 |
index 2b7c7f36b22..10bb6ec3285 100644 |
76 |
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild |
77 |
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild |
78 |
@@ -1,4 +1,4 @@ |
79 |
-# Copyright 1999-2017 Gentoo Foundation |
80 |
+# Copyright 1999-2018 Gentoo Foundation |
81 |
# Distributed under the terms of the GNU General Public License v2 |
82 |
|
83 |
EAPI="5" |
84 |
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ]; then |
85 |
inherit git-r3 |
86 |
else |
87 |
SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz |
88 |
- https://dev.gentoo.org/~ryao/dist/zfs-${PV}-patches-p${PR#r}.tar.xz" |
89 |
+ https://dev.gentoo.org/~ryao/dist/zfs-${PV}-patches-p1.tar.xz" |
90 |
S="${WORKDIR}/zfs-${PV}" |
91 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64" |
92 |
fi |
93 |
@@ -46,7 +46,9 @@ DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) |
94 |
|
95 |
pkg_setup() { |
96 |
linux-info_pkg_setup |
97 |
- CONFIG_CHECK="!DEBUG_LOCK_ALLOC |
98 |
+ CONFIG_CHECK=" |
99 |
+ !DEBUG_LOCK_ALLOC |
100 |
+ !CONFIG_REISER4_FS |
101 |
EFI_PARTITION |
102 |
IOSCHED_NOOP |
103 |
MODULES |
104 |
|
105 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.3.ebuild |
106 |
deleted file mode 100644 |
107 |
index 6de1cb67ef1..00000000000 |
108 |
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.3.ebuild |
109 |
+++ /dev/null |
110 |
@@ -1,144 +0,0 @@ |
111 |
-# Copyright 1999-2017 Gentoo Foundation |
112 |
-# Distributed under the terms of the GNU General Public License v2 |
113 |
- |
114 |
-EAPI="5" |
115 |
- |
116 |
-if [ ${PV} == "9999" ]; then |
117 |
- AUTOTOOLS_AUTORECONF="1" |
118 |
- EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" |
119 |
- inherit git-r3 |
120 |
-else |
121 |
- SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" |
122 |
- S="${WORKDIR}/zfs-${PV}" |
123 |
- KEYWORDS=" ~amd64" |
124 |
-fi |
125 |
- |
126 |
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils |
127 |
- |
128 |
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" |
129 |
-HOMEPAGE="http://zfsonlinux.org/" |
130 |
- |
131 |
-LICENSE="CDDL debug? ( GPL-2+ )" |
132 |
-SLOT="0" |
133 |
-IUSE="custom-cflags debug +rootfs" |
134 |
-RESTRICT="debug? ( strip ) test" |
135 |
- |
136 |
-DEPEND=" |
137 |
- =sys-kernel/spl-${PV}* |
138 |
- dev-lang/perl |
139 |
- virtual/awk |
140 |
-" |
141 |
- |
142 |
-RDEPEND="${DEPEND} |
143 |
- !sys-fs/zfs-fuse |
144 |
-" |
145 |
- |
146 |
-AT_M4DIR="config" |
147 |
-AUTOTOOLS_IN_SOURCE_BUILD="1" |
148 |
- |
149 |
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) |
150 |
- |
151 |
-pkg_setup() { |
152 |
- linux-info_pkg_setup |
153 |
- CONFIG_CHECK="!DEBUG_LOCK_ALLOC |
154 |
- EFI_PARTITION |
155 |
- IOSCHED_NOOP |
156 |
- MODULES |
157 |
- !PAX_KERNEXEC_PLUGIN_METHOD_OR |
158 |
- ZLIB_DEFLATE |
159 |
- ZLIB_INFLATE |
160 |
- " |
161 |
- |
162 |
- use debug && CONFIG_CHECK="${CONFIG_CHECK} |
163 |
- FRAME_POINTER |
164 |
- DEBUG_INFO |
165 |
- !DEBUG_INFO_REDUCED |
166 |
- " |
167 |
- |
168 |
- use rootfs && \ |
169 |
- CONFIG_CHECK="${CONFIG_CHECK} |
170 |
- BLK_DEV_INITRD |
171 |
- DEVTMPFS |
172 |
- " |
173 |
- |
174 |
- kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
175 |
- |
176 |
- [ ${PV} != "9999" ] && \ |
177 |
- { kernel_is le 4 13 || die "Linux 4.13 is the latest supported version."; } |
178 |
- |
179 |
- check_extra_config |
180 |
-} |
181 |
- |
182 |
-src_prepare() { |
183 |
- # Remove GPLv2-licensed ZPIOS unless we are debugging |
184 |
- use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" |
185 |
- |
186 |
- # Set module revision number |
187 |
- [ ${PV} != "9999" ] && \ |
188 |
- { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } |
189 |
- |
190 |
- autotools-utils_src_prepare |
191 |
-} |
192 |
- |
193 |
-src_configure() { |
194 |
- local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" |
195 |
- use custom-cflags || strip-flags |
196 |
- filter-ldflags -Wl,* |
197 |
- |
198 |
- set_arch_to_kernel |
199 |
- local myeconfargs=(${myeconfargs} |
200 |
- --bindir="${EPREFIX}/bin" |
201 |
- --sbindir="${EPREFIX}/sbin" |
202 |
- --with-config=kernel |
203 |
- --with-linux="${KV_DIR}" |
204 |
- --with-linux-obj="${KV_OUT_DIR}" |
205 |
- --with-spl="${EROOT}usr/src/${SPL_PATH}" |
206 |
- --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" |
207 |
- $(use_enable debug) |
208 |
- ) |
209 |
- |
210 |
- autotools-utils_src_configure |
211 |
-} |
212 |
- |
213 |
-src_install() { |
214 |
- autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" |
215 |
-} |
216 |
- |
217 |
-pkg_postinst() { |
218 |
- linux-mod_pkg_postinst |
219 |
- |
220 |
- # Remove old modules |
221 |
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] |
222 |
- then |
223 |
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" |
224 |
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" |
225 |
- ewarn "Automatically removing old modules to avoid problems." |
226 |
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" |
227 |
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
228 |
- fi |
229 |
- |
230 |
- if use x86 || use arm |
231 |
- then |
232 |
- ewarn "32-bit kernels will likely require increasing vmalloc to" |
233 |
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |
234 |
- fi |
235 |
- |
236 |
- ewarn "This version of ZFSOnLinux includes support for new feature flags" |
237 |
- ewarn "that are incompatible with previous versions. GRUB2 support for" |
238 |
- ewarn "/boot with the new feature flags is not yet available." |
239 |
- ewarn "Do *NOT* upgrade root pools to use the new feature flags." |
240 |
- ewarn "Any new pools will be created with the new feature flags by default" |
241 |
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To" |
242 |
- ewarn "create a newpool that is backward compatible wih GRUB2, use " |
243 |
- ewarn |
244 |
- ewarn "zpool create -d -o feature@async_destroy=enabled " |
245 |
- ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" |
246 |
- ewarn " -o feature@spacemap_histogram=enabled" |
247 |
- ewarn " -o feature@enabled_txg=enabled " |
248 |
- ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" |
249 |
- ewarn " ..." |
250 |
- ewarn |
251 |
- ewarn "GRUB2 support will be updated as soon as either the GRUB2" |
252 |
- ewarn "developers do a tag or the Gentoo developers find time to backport" |
253 |
- ewarn "support from GRUB2 HEAD." |
254 |
-} |
255 |
|
256 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.5.ebuild |
257 |
index 547b4e4ffba..df70ae1c9a0 100644 |
258 |
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.5.ebuild |
259 |
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.5.ebuild |
260 |
@@ -1,4 +1,4 @@ |
261 |
-# Copyright 1999-2017 Gentoo Foundation |
262 |
+# Copyright 1999-2018 Gentoo Foundation |
263 |
# Distributed under the terms of the GNU General Public License v2 |
264 |
|
265 |
EAPI="5" |
266 |
@@ -10,7 +10,7 @@ if [ ${PV} == "9999" ]; then |
267 |
else |
268 |
SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" |
269 |
S="${WORKDIR}/zfs-${PV}" |
270 |
- KEYWORDS=" ~amd64" |
271 |
+ KEYWORDS="~amd64" |
272 |
fi |
273 |
|
274 |
inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils |
275 |
@@ -40,7 +40,9 @@ DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) |
276 |
|
277 |
pkg_setup() { |
278 |
linux-info_pkg_setup |
279 |
- CONFIG_CHECK="!DEBUG_LOCK_ALLOC |
280 |
+ CONFIG_CHECK=" |
281 |
+ !DEBUG_LOCK_ALLOC |
282 |
+ !CONFIG_REISER4_FS |
283 |
EFI_PARTITION |
284 |
IOSCHED_NOOP |
285 |
MODULES |
286 |
|
287 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild |
288 |
index 3b61376f387..1b30e443205 100644 |
289 |
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild |
290 |
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild |
291 |
@@ -1,4 +1,4 @@ |
292 |
-# Copyright 1999-2017 Gentoo Foundation |
293 |
+# Copyright 1999-2018 Gentoo Foundation |
294 |
# Distributed under the terms of the GNU General Public License v2 |
295 |
|
296 |
EAPI="5" |
297 |
@@ -40,7 +40,9 @@ DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) |
298 |
|
299 |
pkg_setup() { |
300 |
linux-info_pkg_setup |
301 |
- CONFIG_CHECK="!DEBUG_LOCK_ALLOC |
302 |
+ CONFIG_CHECK=" |
303 |
+ !DEBUG_LOCK_ALLOC |
304 |
+ !CONFIG_REISER4_FS |
305 |
EFI_PARTITION |
306 |
IOSCHED_NOOP |
307 |
MODULES |
308 |
|
309 |
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest |
310 |
index a31b78317fa..479c65e2312 100644 |
311 |
--- a/sys-fs/zfs/Manifest |
312 |
+++ b/sys-fs/zfs/Manifest |
313 |
@@ -1,5 +1,4 @@ |
314 |
DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 |
315 |
DIST zfs-0.6.5.4-patches-p2.tar.xz 63912 BLAKE2B f8bd5d0cd2b6170b45cf40a78b484d9a73017b20a77c603f4bcec63b6c77347b07df74c9d53288b5b2b984135d651d3d3ef830395ff2625576b13d8ce433fbcb SHA512 9f598c2a750b92dadddb677a6a9dda4573fa91421a82270d8104d718da4b945a4d5412bab92037a033cec1ec177f2a0eb52207babd023847918e3754054ec5e9 |
316 |
DIST zfs-0.6.5.4.tar.gz 2506470 BLAKE2B 10a2242081891b94a7863f11b4c3b9e443d3b75b5eb03e8fc88e30484a94555203dec8964075cf23f694777dd699e20acb1a52b5d04cba410b6df84512436e08 SHA512 90c87cd95fd06cf34755358e7cc4053d19f351316133f0b808e7585a3fc8f82e7c0f49072c2995d0520de5104fd04d91a166a0d5b6c923c82dfb2fb4f7f57a01 |
317 |
-DIST zfs-0.7.3.tar.gz 6393145 BLAKE2B ed384306cdee1ff5450e45981bbb19e7f399a637f2c08ee1c31ab155f8ca9e7b6526ca9241e1aa8ae9aa55d51898d3525d149027e68ce2c454f9fafb44badfcf SHA512 fe116fd787050f7bc099fe3ed5335c2d18711e5e665af5be13b3971939258e036e273432e80106e704f037d1f6e3114b12e26b01f97b575723f8bd46acdcbf61 |
318 |
DIST zfs-0.7.5.tar.gz 6403102 BLAKE2B 5159b2ab811b2f7bcbbc708814e07e68b0b38d7b5fca4a82205c7bb4332155121f1385f2cd3a6b7acb6bd64d13b9ad2af85d42b90623efb0f33a2f542fb90803 SHA512 3512aaa6225f74323f2d14e029a113593e0cf44be2ab18cc42dcb82d237b88843ccd7e48ed73a4c6f6da574151c1af461e0528725e11bcb42280467e37f63df2 |
319 |
|
320 |
diff --git a/sys-fs/zfs/zfs-0.6.5.11.ebuild b/sys-fs/zfs/zfs-0.6.5.11-r1.ebuild |
321 |
similarity index 98% |
322 |
rename from sys-fs/zfs/zfs-0.6.5.11.ebuild |
323 |
rename to sys-fs/zfs/zfs-0.6.5.11-r1.ebuild |
324 |
index 9d6cba3ac80..449cc7656e9 100644 |
325 |
--- a/sys-fs/zfs/zfs-0.6.5.11.ebuild |
326 |
+++ b/sys-fs/zfs/zfs-0.6.5.11-r1.ebuild |
327 |
@@ -1,4 +1,4 @@ |
328 |
-# Copyright 1999-2017 Gentoo Foundation |
329 |
+# Copyright 1999-2018 Gentoo Foundation |
330 |
# Distributed under the terms of the GNU General Public License v2 |
331 |
|
332 |
EAPI="5" |
333 |
@@ -10,7 +10,7 @@ if [ ${PV} == "9999" ] ; then |
334 |
EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" |
335 |
else |
336 |
SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" |
337 |
- KEYWORDS=" ~amd64" |
338 |
+ KEYWORDS="~amd64" |
339 |
fi |
340 |
|
341 |
inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev |
342 |
@@ -24,6 +24,7 @@ IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" |
343 |
RESTRICT="test" |
344 |
|
345 |
COMMON_DEPEND=" |
346 |
+ net-libs/libtirpc |
347 |
sys-apps/util-linux[static-libs?] |
348 |
sys-libs/zlib[static-libs(+)?] |
349 |
virtual/awk |
350 |
|
351 |
diff --git a/sys-fs/zfs/zfs-0.6.5.4-r2.ebuild b/sys-fs/zfs/zfs-0.6.5.4-r3.ebuild |
352 |
similarity index 98% |
353 |
rename from sys-fs/zfs/zfs-0.6.5.4-r2.ebuild |
354 |
rename to sys-fs/zfs/zfs-0.6.5.4-r3.ebuild |
355 |
index 20476c4711d..07119a758de 100644 |
356 |
--- a/sys-fs/zfs/zfs-0.6.5.4-r2.ebuild |
357 |
+++ b/sys-fs/zfs/zfs-0.6.5.4-r3.ebuild |
358 |
@@ -1,4 +1,4 @@ |
359 |
-# Copyright 1999-2017 Gentoo Foundation |
360 |
+# Copyright 1999-2018 Gentoo Foundation |
361 |
# Distributed under the terms of the GNU General Public License v2 |
362 |
|
363 |
EAPI="5" |
364 |
@@ -14,7 +14,7 @@ if [ ${PV} == "9999" ] ; then |
365 |
EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" |
366 |
else |
367 |
SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz |
368 |
- https://dev.gentoo.org/~ryao/dist/${P}-patches-p${PR#r}.tar.xz" |
369 |
+ https://dev.gentoo.org/~ryao/dist/${P}-patches-p2.tar.xz" |
370 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64" |
371 |
fi |
372 |
|
373 |
@@ -29,6 +29,7 @@ IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" |
374 |
RESTRICT="test" |
375 |
|
376 |
COMMON_DEPEND=" |
377 |
+ net-libs/libtirpc |
378 |
sys-apps/util-linux[static-libs?] |
379 |
sys-libs/zlib[static-libs(+)?] |
380 |
virtual/awk |
381 |
|
382 |
diff --git a/sys-fs/zfs/zfs-0.7.3.ebuild b/sys-fs/zfs/zfs-0.7.3.ebuild |
383 |
deleted file mode 100644 |
384 |
index c5bf9372537..00000000000 |
385 |
--- a/sys-fs/zfs/zfs-0.7.3.ebuild |
386 |
+++ /dev/null |
387 |
@@ -1,201 +0,0 @@ |
388 |
-# Copyright 1999-2017 Gentoo Foundation |
389 |
-# Distributed under the terms of the GNU General Public License v2 |
390 |
- |
391 |
-EAPI="5" |
392 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
393 |
- |
394 |
-if [ ${PV} == "9999" ] ; then |
395 |
- inherit git-r3 linux-mod |
396 |
- AUTOTOOLS_AUTORECONF="1" |
397 |
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" |
398 |
-else |
399 |
- SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" |
400 |
- KEYWORDS=" ~amd64" |
401 |
-fi |
402 |
- |
403 |
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev |
404 |
- |
405 |
-DESCRIPTION="Userland utilities for ZFS Linux kernel module" |
406 |
-HOMEPAGE="http://zfsonlinux.org/" |
407 |
- |
408 |
-LICENSE="BSD-2 CDDL MIT" |
409 |
-SLOT="0" |
410 |
-IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" |
411 |
-RESTRICT="test" |
412 |
- |
413 |
-COMMON_DEPEND=" |
414 |
- sys-apps/util-linux[static-libs?] |
415 |
- sys-libs/zlib[static-libs(+)?] |
416 |
- virtual/awk |
417 |
-" |
418 |
-DEPEND="${COMMON_DEPEND} |
419 |
- virtual/pkgconfig |
420 |
-" |
421 |
- |
422 |
-RDEPEND="${COMMON_DEPEND} |
423 |
- !=sys-apps/grep-2.13* |
424 |
- !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) |
425 |
- !sys-fs/zfs-fuse |
426 |
- !prefix? ( virtual/udev ) |
427 |
- test-suite? ( |
428 |
- sys-apps/util-linux |
429 |
- sys-devel/bc |
430 |
- sys-block/parted |
431 |
- sys-fs/lsscsi |
432 |
- sys-fs/mdadm |
433 |
- sys-process/procps |
434 |
- virtual/modutils |
435 |
- ) |
436 |
- rootfs? ( |
437 |
- app-arch/cpio |
438 |
- app-misc/pax-utils |
439 |
- !<sys-boot/grub-2.00-r2:2 |
440 |
- !<sys-kernel/genkernel-3.5.1.1 |
441 |
- !<sys-kernel/genkernel-next-67 |
442 |
- !<sys-kernel/bliss-initramfs-7.1.0 |
443 |
- !<sys-kernel/dracut-044-r1 |
444 |
- ) |
445 |
- sys-fs/udev-init-scripts |
446 |
-" |
447 |
- |
448 |
-AT_M4DIR="config" |
449 |
-AUTOTOOLS_IN_SOURCE_BUILD="1" |
450 |
- |
451 |
-pkg_setup() { |
452 |
- if use kernel_linux && use test-suite; then |
453 |
- linux-info_pkg_setup |
454 |
- if ! linux_config_exists; then |
455 |
- ewarn "Cannot check the linux kernel configuration." |
456 |
- else |
457 |
- # recheck that we don't have usblp to collide with libusb |
458 |
- if use test-suite; then |
459 |
- if linux_chkconfig_present BLK_DEV_LOOP; then |
460 |
- eerror "The ZFS test suite requires loop device support enabled." |
461 |
- eerror "Please enable it:" |
462 |
- eerror " CONFIG_BLK_DEV_LOOP=y" |
463 |
- eerror "in /usr/src/linux/.config or" |
464 |
- eerror " Device Drivers --->" |
465 |
- eerror " Block devices --->" |
466 |
- eerror " [ ] Loopback device support" |
467 |
- fi |
468 |
- fi |
469 |
- fi |
470 |
- fi |
471 |
- |
472 |
-} |
473 |
- |
474 |
-src_prepare() { |
475 |
- # Update paths |
476 |
- sed -e "s|/sbin/lsmod|/bin/lsmod|" \ |
477 |
- -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ |
478 |
- -e "s|/sbin/parted|/usr/sbin/parted|" \ |
479 |
- -i scripts/common.sh.in |
480 |
- |
481 |
- autotools-utils_src_prepare |
482 |
-} |
483 |
- |
484 |
-src_configure() { |
485 |
- use custom-cflags || strip-flags |
486 |
- local myeconfargs=( |
487 |
- --bindir="${EPREFIX}/bin" |
488 |
- --sbindir="${EPREFIX}/sbin" |
489 |
- --with-config=user |
490 |
- --with-dracutdir="/usr/$(get_libdir)/dracut" |
491 |
- --with-linux="${KV_DIR}" |
492 |
- --with-linux-obj="${KV_OUT_DIR}" |
493 |
- --with-udevdir="$(get_udevdir)" |
494 |
- --with-blkid |
495 |
- $(use_enable debug) |
496 |
- ) |
497 |
- autotools-utils_src_configure |
498 |
- |
499 |
- # prepare systemd unit and helper script |
500 |
- cat "${FILESDIR}/zfs.service.in" | \ |
501 |
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ |
502 |
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ |
503 |
- > "${T}/zfs.service" || die |
504 |
- cat "${FILESDIR}/zfs-init.sh.in" | \ |
505 |
- sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ |
506 |
- -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ |
507 |
- > "${T}/zfs-init.sh" || die |
508 |
-} |
509 |
- |
510 |
-src_install() { |
511 |
- autotools-utils_src_install |
512 |
- gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core |
513 |
- use test-suite || rm -rf "${ED}usr/share/zfs" |
514 |
- |
515 |
- newbashcomp "${FILESDIR}/bash-completion-r1" zfs |
516 |
- bashcomp_alias zfs zpool |
517 |
- |
518 |
- exeinto /usr/libexec |
519 |
- doexe "${T}/zfs-init.sh" |
520 |
- systemd_dounit "${T}/zfs.service" |
521 |
-} |
522 |
- |
523 |
-pkg_postinst() { |
524 |
- if ! use kernel-builtin && [ ${PV} = "9999" ] |
525 |
- then |
526 |
- einfo "Adding ${P} to the module database to ensure that the" |
527 |
- einfo "kernel modules and userland utilities stay in sync." |
528 |
- update_moduledb |
529 |
- fi |
530 |
- |
531 |
- if [ -e "${EROOT}etc/runlevels/boot/zfs" ] |
532 |
- then |
533 |
- einfo 'The zfs boot script has been split into the zfs-import,' |
534 |
- einfo 'zfs-mount and zfs-share scripts.' |
535 |
- einfo |
536 |
- einfo 'You had the zfs script in your boot runlevel. For your' |
537 |
- einfo 'convenience, it has been automatically removed and the three' |
538 |
- einfo 'scripts that replace it have been configured to start.' |
539 |
- einfo 'The zfs-import and zfs-mount scripts have been added to the boot' |
540 |
- einfo 'runlevel while the zfs-share script is in the default runlevel.' |
541 |
- |
542 |
- rm "${EROOT}etc/runlevels/boot/zfs" |
543 |
- ln -snf "${EROOT}etc/init.d/zfs-import" \ |
544 |
- "${EROOT}etc/runlevels/boot/zfs-import" |
545 |
- ln -snf "${EROOT}etc/init.d/zfs-mount" \ |
546 |
- "${EROOT}etc/runlevels/boot/zfs-mount" |
547 |
- ln -snf "${EROOT}etc/init.d/zfs-share" \ |
548 |
- "${EROOT}etc/runlevels/default/zfs-share" |
549 |
- else |
550 |
- [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ |
551 |
- einfo "You should add zfs-import to the boot runlevel." |
552 |
- [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ |
553 |
- einfo "You should add zfs-mount to the boot runlevel." |
554 |
- [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ |
555 |
- einfo "You should add zfs-share to the default runlevel." |
556 |
- fi |
557 |
- |
558 |
- if [ -e "${EROOT}etc/runlevels/default/zed" ] |
559 |
- then |
560 |
- einfo 'The downstream OpenRC zed script has replaced by the upstream' |
561 |
- einfo 'OpenRC zfs-zed script.' |
562 |
- einfo |
563 |
- einfo 'You had the zed script in your default runlevel. For your' |
564 |
- einfo 'convenience, it has been automatically removed and the zfs-zed' |
565 |
- einfo 'script that replaced it has been configured to start.' |
566 |
- |
567 |
- rm "${EROOT}etc/runlevels/boot/zed" |
568 |
- ln -snf "${EROOT}etc/init.d/zfs-sed" \ |
569 |
- "${EROOT}etc/runlevels/default/zfs-zed" |
570 |
- else |
571 |
- [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ |
572 |
- einfo "You should add zfs-zed to the default runlevel." |
573 |
- fi |
574 |
- |
575 |
- if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] |
576 |
- then |
577 |
- einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." |
578 |
- rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" |
579 |
- fi |
580 |
- |
581 |
-} |
582 |
- |
583 |
-pkg_postrm() { |
584 |
- if ! use kernel-builtin && [ ${PV} = "9999" ] |
585 |
- then |
586 |
- remove_moduledb |
587 |
- fi |
588 |
-} |
589 |
|
590 |
diff --git a/sys-fs/zfs/zfs-0.7.5.ebuild b/sys-fs/zfs/zfs-0.7.5-r1.ebuild |
591 |
similarity index 98% |
592 |
rename from sys-fs/zfs/zfs-0.7.5.ebuild |
593 |
rename to sys-fs/zfs/zfs-0.7.5-r1.ebuild |
594 |
index c5bf9372537..596e6635277 100644 |
595 |
--- a/sys-fs/zfs/zfs-0.7.5.ebuild |
596 |
+++ b/sys-fs/zfs/zfs-0.7.5-r1.ebuild |
597 |
@@ -1,4 +1,4 @@ |
598 |
-# Copyright 1999-2017 Gentoo Foundation |
599 |
+# Copyright 1999-2018 Gentoo Foundation |
600 |
# Distributed under the terms of the GNU General Public License v2 |
601 |
|
602 |
EAPI="5" |
603 |
@@ -10,7 +10,7 @@ if [ ${PV} == "9999" ] ; then |
604 |
EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" |
605 |
else |
606 |
SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" |
607 |
- KEYWORDS=" ~amd64" |
608 |
+ KEYWORDS="~amd64" |
609 |
fi |
610 |
|
611 |
inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev |
612 |
@@ -24,6 +24,7 @@ IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" |
613 |
RESTRICT="test" |
614 |
|
615 |
COMMON_DEPEND=" |
616 |
+ net-libs/libtirpc |
617 |
sys-apps/util-linux[static-libs?] |
618 |
sys-libs/zlib[static-libs(+)?] |
619 |
virtual/awk |
620 |
|
621 |
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild |
622 |
index 73df3b10b91..7b8d2f94a45 100644 |
623 |
--- a/sys-fs/zfs/zfs-9999.ebuild |
624 |
+++ b/sys-fs/zfs/zfs-9999.ebuild |
625 |
@@ -1,4 +1,4 @@ |
626 |
-# Copyright 1999-2017 Gentoo Foundation |
627 |
+# Copyright 1999-2018 Gentoo Foundation |
628 |
# Distributed under the terms of the GNU General Public License v2 |
629 |
|
630 |
EAPI="5" |
631 |
@@ -24,6 +24,7 @@ IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" |
632 |
RESTRICT="test" |
633 |
|
634 |
COMMON_DEPEND=" |
635 |
+ net-libs/libtirpc |
636 |
sys-apps/util-linux[static-libs?] |
637 |
sys-libs/zlib[static-libs(+)?] |
638 |
virtual/awk |
639 |
|
640 |
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest |
641 |
index 65587d31145..7e44cfab010 100644 |
642 |
--- a/sys-kernel/spl/Manifest |
643 |
+++ b/sys-kernel/spl/Manifest |
644 |
@@ -1,5 +1,4 @@ |
645 |
DIST spl-0.6.5.11.tar.gz 531710 BLAKE2B e89cb5a023d3f4b3949a385100b56e01c5fd0ff4448bc175f8463a84b74d1d8f1fcf669c2e4b73f2ec3326653594106ebfa3e66987e49a9cd029355bbb317990 SHA512 eae1641a0d528cb9182deccd309625e13abf3db88ba1cbb54947055b23d1f94b62c045f939d5e952784f19719eea5fdf85d65c5abd22b9db167ea7780bc55722 |
646 |
DIST spl-0.6.5.4-patches-p1.tar.xz 2020 BLAKE2B 82b836df5c18f68ebd967d5d33e65232167ff1c4b1da3998dadf49c1fd0ffad4a86fa418a30ba0ba106ee4baa190fc51dedabec68083af80e5eb5aa1b225dcc5 SHA512 2650f06bf23045bd2805ef58baa2561534373862e1fbbaf189cf93283aa8e18cbee989b4e81751b37da3058aeba357cf8e46db97331379e1b5eafde7faa33851 |
647 |
DIST spl-0.6.5.4.tar.gz 556298 BLAKE2B 142d92ece51f544ed53f8d15390a97469b322c0e8f16c6510eb72f69493a3489f98ead9fa4138765b364c22777ee0cb49a76c4d9b1c4ac4e5ce8c0e5dbfe9952 SHA512 a50d804008237820d6a8e7d938f6699df2966836ebedf0b6a4421f55bd6c24ae69e8f80eaf3aa2b7f6ed308983ab4ca11abfb32f98c8d070e4957b4802e00cac |
648 |
-DIST spl-0.7.3.tar.gz 548434 BLAKE2B ecdf0b46d4e02f2ff7a06a68c87ee448502dd04a10720872ed52d594c6f6a80beac04d2a73c18cc8d5ea9ddd4c2ea30187f323f9bc972b4e59a310825b3fb054 SHA512 22d081449e699147f3bcd9791c89709196bb08cf3cd17cdd6fe2472fd9fb5011d6ea52e2c9c95be89d5cc46704b38a4ac57821584e1691b7bb8b0a705a6d78a1 |
649 |
DIST spl-0.7.5.tar.gz 549272 BLAKE2B b645c68fa53e3e10a80788684efbeeafecb04753a1b515de32555943f372fa61c1c24cd7afac1cc646de572daa32f88c5b95662797a085c756519e03fdf3e46f SHA512 a797ddab6841cbe9c7eacc4f276537ecb5905a694604185044e98ed017b325367a1fdd1ea6830d29d4a21ed11a8d1ff0505bda7bbd2112418db319df128141a3 |
650 |
|
651 |
diff --git a/sys-kernel/spl/spl-0.6.5.11.ebuild b/sys-kernel/spl/spl-0.6.5.11.ebuild |
652 |
index fc6a7c74ebf..cd71c032ccc 100644 |
653 |
--- a/sys-kernel/spl/spl-0.6.5.11.ebuild |
654 |
+++ b/sys-kernel/spl/spl-0.6.5.11.ebuild |
655 |
@@ -1,4 +1,4 @@ |
656 |
-# Copyright 1999-2017 Gentoo Foundation |
657 |
+# Copyright 1999-2018 Gentoo Foundation |
658 |
# Distributed under the terms of the GNU General Public License v2 |
659 |
|
660 |
EAPI="5" |
661 |
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then |
662 |
inherit git-r3 |
663 |
else |
664 |
SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz" |
665 |
- KEYWORDS=" ~amd64" |
666 |
+ KEYWORDS="~amd64" |
667 |
fi |
668 |
|
669 |
inherit flag-o-matic linux-info linux-mod autotools-utils |
670 |
@@ -22,7 +22,8 @@ SLOT="0" |
671 |
IUSE="custom-cflags debug" |
672 |
RESTRICT="debug? ( strip ) test" |
673 |
|
674 |
-COMMON_DEPEND="dev-lang/perl |
675 |
+COMMON_DEPEND=" |
676 |
+ dev-lang/perl |
677 |
virtual/awk" |
678 |
|
679 |
DEPEND="${COMMON_DEPEND}" |
680 |
@@ -38,6 +39,7 @@ pkg_setup() { |
681 |
linux-info_pkg_setup |
682 |
CONFIG_CHECK=" |
683 |
!DEBUG_LOCK_ALLOC |
684 |
+ !CONFIG_REISER4_FS |
685 |
MODULES |
686 |
KALLSYMS |
687 |
!PAX_KERNEXEC_PLUGIN_METHOD_OR |
688 |
|
689 |
diff --git a/sys-kernel/spl/spl-0.6.5.4-r1.ebuild b/sys-kernel/spl/spl-0.6.5.4-r1.ebuild |
690 |
index 036383da98c..887c46dc770 100644 |
691 |
--- a/sys-kernel/spl/spl-0.6.5.4-r1.ebuild |
692 |
+++ b/sys-kernel/spl/spl-0.6.5.4-r1.ebuild |
693 |
@@ -1,4 +1,4 @@ |
694 |
-# Copyright 1999-2017 Gentoo Foundation |
695 |
+# Copyright 1999-2018 Gentoo Foundation |
696 |
# Distributed under the terms of the GNU General Public License v2 |
697 |
|
698 |
EAPI="5" |
699 |
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then |
700 |
inherit git-r3 |
701 |
else |
702 |
SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz |
703 |
- https://dev.gentoo.org/~ryao/dist/${P}-patches-p${PR#r}.tar.xz" |
704 |
+ https://dev.gentoo.org/~ryao/dist/${P}-patches-p1.tar.xz" |
705 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64" |
706 |
fi |
707 |
|
708 |
@@ -23,7 +23,8 @@ SLOT="0" |
709 |
IUSE="custom-cflags debug" |
710 |
RESTRICT="debug? ( strip ) test" |
711 |
|
712 |
-COMMON_DEPEND="dev-lang/perl |
713 |
+COMMON_DEPEND=" |
714 |
+ dev-lang/perl |
715 |
virtual/awk" |
716 |
|
717 |
DEPEND="${COMMON_DEPEND}" |
718 |
@@ -39,6 +40,7 @@ pkg_setup() { |
719 |
linux-info_pkg_setup |
720 |
CONFIG_CHECK=" |
721 |
!DEBUG_LOCK_ALLOC |
722 |
+ !CONFIG_REISER4_FS |
723 |
!GRKERNSEC_RANDSTRUCT |
724 |
KALLSYMS |
725 |
MODULES |
726 |
|
727 |
diff --git a/sys-kernel/spl/spl-0.7.3.ebuild b/sys-kernel/spl/spl-0.7.3.ebuild |
728 |
deleted file mode 100644 |
729 |
index 2b74e28c249..00000000000 |
730 |
--- a/sys-kernel/spl/spl-0.7.3.ebuild |
731 |
+++ /dev/null |
732 |
@@ -1,110 +0,0 @@ |
733 |
-# Copyright 1999-2017 Gentoo Foundation |
734 |
-# Distributed under the terms of the GNU General Public License v2 |
735 |
- |
736 |
-EAPI="5" |
737 |
- |
738 |
-if [[ ${PV} == "9999" ]] ; then |
739 |
- AUTOTOOLS_AUTORECONF="1" |
740 |
- EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" |
741 |
- inherit git-r3 |
742 |
-else |
743 |
- SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz" |
744 |
- KEYWORDS=" ~amd64" |
745 |
-fi |
746 |
- |
747 |
-inherit flag-o-matic linux-info linux-mod autotools-utils |
748 |
- |
749 |
-DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs" |
750 |
-HOMEPAGE="http://zfsonlinux.org/" |
751 |
- |
752 |
-LICENSE="GPL-2" |
753 |
-SLOT="0" |
754 |
-IUSE="custom-cflags debug" |
755 |
-RESTRICT="debug? ( strip ) test" |
756 |
- |
757 |
-COMMON_DEPEND="dev-lang/perl |
758 |
- virtual/awk" |
759 |
- |
760 |
-DEPEND="${COMMON_DEPEND}" |
761 |
- |
762 |
-RDEPEND="${COMMON_DEPEND} |
763 |
- !sys-devel/spl" |
764 |
- |
765 |
-AT_M4DIR="config" |
766 |
-AUTOTOOLS_IN_SOURCE_BUILD="1" |
767 |
-DOCS=( AUTHORS DISCLAIMER ) |
768 |
- |
769 |
-pkg_setup() { |
770 |
- linux-info_pkg_setup |
771 |
- CONFIG_CHECK=" |
772 |
- !DEBUG_LOCK_ALLOC |
773 |
- MODULES |
774 |
- KALLSYMS |
775 |
- !PAX_KERNEXEC_PLUGIN_METHOD_OR |
776 |
- !PAX_SIZE_OVERFLOW |
777 |
- ZLIB_DEFLATE |
778 |
- ZLIB_INFLATE |
779 |
- " |
780 |
- |
781 |
- use debug && CONFIG_CHECK="${CONFIG_CHECK} |
782 |
- FRAME_POINTER |
783 |
- DEBUG_INFO |
784 |
- !DEBUG_INFO_REDUCED |
785 |
- " |
786 |
- |
787 |
- kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
788 |
- |
789 |
- [ ${PV} != "9999" ] && \ |
790 |
- { kernel_is le 4 13 || die "Linux 4.13 is the latest supported version."; } |
791 |
- |
792 |
- check_extra_config |
793 |
-} |
794 |
- |
795 |
-src_prepare() { |
796 |
- # Workaround for hard coded path |
797 |
- sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \ |
798 |
- die "Cannot patch check.sh" |
799 |
- |
800 |
- # splat is unnecessary unless we are debugging |
801 |
- use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; } |
802 |
- |
803 |
- # Set module revision number |
804 |
- [ ${PV} != "9999" ] && \ |
805 |
- { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } |
806 |
- |
807 |
- autotools-utils_src_prepare |
808 |
-} |
809 |
- |
810 |
-src_configure() { |
811 |
- use custom-cflags || strip-flags |
812 |
- filter-ldflags -Wl,* |
813 |
- |
814 |
- set_arch_to_kernel |
815 |
- local myeconfargs=( |
816 |
- --bindir="${EPREFIX}/bin" |
817 |
- --sbindir="${EPREFIX}/sbin" |
818 |
- --with-config=all |
819 |
- --with-linux="${KV_DIR}" |
820 |
- --with-linux-obj="${KV_OUT_DIR}" |
821 |
- $(use_enable debug) |
822 |
- ) |
823 |
- autotools-utils_src_configure |
824 |
-} |
825 |
- |
826 |
-src_install() { |
827 |
- autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" |
828 |
-} |
829 |
- |
830 |
-pkg_postinst() { |
831 |
- linux-mod_pkg_postinst |
832 |
- |
833 |
- # Remove old modules |
834 |
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ] |
835 |
- then |
836 |
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl" |
837 |
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl" |
838 |
- ewarn "Automatically removing old modules to avoid problems." |
839 |
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules" |
840 |
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
841 |
- fi |
842 |
-} |
843 |
|
844 |
diff --git a/sys-kernel/spl/spl-0.7.5.ebuild b/sys-kernel/spl/spl-0.7.5.ebuild |
845 |
index 515730e4bd7..351b1b4c31c 100644 |
846 |
--- a/sys-kernel/spl/spl-0.7.5.ebuild |
847 |
+++ b/sys-kernel/spl/spl-0.7.5.ebuild |
848 |
@@ -1,4 +1,4 @@ |
849 |
-# Copyright 1999-2017 Gentoo Foundation |
850 |
+# Copyright 1999-2018 Gentoo Foundation |
851 |
# Distributed under the terms of the GNU General Public License v2 |
852 |
|
853 |
EAPI="5" |
854 |
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then |
855 |
inherit git-r3 |
856 |
else |
857 |
SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz" |
858 |
- KEYWORDS=" ~amd64" |
859 |
+ KEYWORDS="~amd64" |
860 |
fi |
861 |
|
862 |
inherit flag-o-matic linux-info linux-mod autotools-utils |
863 |
@@ -22,7 +22,8 @@ SLOT="0" |
864 |
IUSE="custom-cflags debug" |
865 |
RESTRICT="debug? ( strip ) test" |
866 |
|
867 |
-COMMON_DEPEND="dev-lang/perl |
868 |
+COMMON_DEPEND=" |
869 |
+ dev-lang/perl |
870 |
virtual/awk" |
871 |
|
872 |
DEPEND="${COMMON_DEPEND}" |
873 |
@@ -38,6 +39,7 @@ pkg_setup() { |
874 |
linux-info_pkg_setup |
875 |
CONFIG_CHECK=" |
876 |
!DEBUG_LOCK_ALLOC |
877 |
+ !CONFIG_REISER4_FS |
878 |
MODULES |
879 |
KALLSYMS |
880 |
!PAX_KERNEXEC_PLUGIN_METHOD_OR |
881 |
|
882 |
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild |
883 |
index 4d2feca4078..7ec7b4379ff 100644 |
884 |
--- a/sys-kernel/spl/spl-9999.ebuild |
885 |
+++ b/sys-kernel/spl/spl-9999.ebuild |
886 |
@@ -1,4 +1,4 @@ |
887 |
-# Copyright 1999-2017 Gentoo Foundation |
888 |
+# Copyright 1999-2018 Gentoo Foundation |
889 |
# Distributed under the terms of the GNU General Public License v2 |
890 |
|
891 |
EAPI="5" |
892 |
@@ -22,7 +22,8 @@ SLOT="0" |
893 |
IUSE="custom-cflags debug" |
894 |
RESTRICT="debug? ( strip ) test" |
895 |
|
896 |
-COMMON_DEPEND="dev-lang/perl |
897 |
+COMMON_DEPEND=" |
898 |
+ dev-lang/perl |
899 |
virtual/awk" |
900 |
|
901 |
DEPEND="${COMMON_DEPEND}" |
902 |
@@ -38,6 +39,7 @@ pkg_setup() { |
903 |
linux-info_pkg_setup |
904 |
CONFIG_CHECK=" |
905 |
!DEBUG_LOCK_ALLOC |
906 |
+ !CONFIG_REISER4_FS |
907 |
!GRKERNSEC_RANDSTRUCT |
908 |
KALLSYMS |
909 |
MODULES |