1 |
commit: ac86e2dd8e23d43b6814954cc262840171b3e192 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 26 20:27:11 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 26 21:09:40 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac86e2dd |
7 |
|
8 |
sys-fs/zfs-kmod: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.65, Repoman-2.3.12 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
sys-fs/zfs-kmod/Manifest | 4 - |
14 |
.../files/zfs-kmod-0.7.12-kernel-4.20-compat.patch | 31 ----- |
15 |
sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild | 146 ------------------- |
16 |
sys-fs/zfs-kmod/zfs-kmod-0.7.12-r1.ebuild | 148 -------------------- |
17 |
sys-fs/zfs-kmod/zfs-kmod-0.7.8.ebuild | 146 ------------------- |
18 |
sys-fs/zfs-kmod/zfs-kmod-0.7.9-r1.ebuild | 155 --------------------- |
19 |
sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild | 146 ------------------- |
20 |
7 files changed, 776 deletions(-) |
21 |
|
22 |
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest |
23 |
index 27a9625015d..7d8b4df3603 100644 |
24 |
--- a/sys-fs/zfs-kmod/Manifest |
25 |
+++ b/sys-fs/zfs-kmod/Manifest |
26 |
@@ -1,8 +1,4 @@ |
27 |
DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 |
28 |
-DIST zfs-0.7.11.tar.gz 6561125 BLAKE2B ee579aa01272d5565fe78ae6074dc1acdd34c8e9a26838462aea937132c322b0fb915c4dadec230560d586db2b2af129735ed6b5e41def4183c9c7ed456ca7aa SHA512 b53c92de2c2542a1b0189368e4b298e93bea13aec8ba415559e86bfc01a9c7deaf436e694aa047ef8a302c79224f96edd150ea93a57eb88c9e26d054cf7ccd2b |
29 |
DIST zfs-0.7.12.tar.gz 6565017 BLAKE2B 493df30ecce1f169e02d6c8262ba71cc9e7b01d5b17ce188004f522f0c93943b858434067cba8173ccb3e08cde24a1d3e8a3996b2e852f8bc35251f8c4ab3809 SHA512 278e411eac5fb2a91108671b64521c2bd5c08024d5829e1679d8f243dfc3c6317363ed9c79dabfddecf425acb6b3003eeaf4e7d991513cbcae4d2644f5d30bf2 |
30 |
DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e |
31 |
-DIST zfs-0.7.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7ef215f735180406a7fc0d4d3c9700a41e855186d8044b304c9f0c142c2bdca387299c499974e424965970a4 SHA512 cdeabe10acd2feeeff8a6362987c757b716bfea6ebad42ce022a081106661f774150c113bdaa9e1ac441efdd6da4cf11e6119323ad60ae15ab445a872d952e35 |
32 |
-DIST zfs-0.7.9-r1-patches.tar.xz 10920 BLAKE2B 50a0b8533061b5eecc103179e6fd51499d87f1c3b331b0629efa29a5a7d405c03448db2245fed9389d149cc83021a2c263bc2f02133a5fdd11b088516c353fff SHA512 a9e8c04bf7449b0a63420202b2f6dd8a6aea96ac57e5925c2ca0223f662210f42316ada25aa6113103909de8c9976945828cdb91a6ff9932f282c01316d7b3ec |
33 |
-DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa |
34 |
DIST zfs-0.8.0-rc4.tar.gz 8874029 BLAKE2B 17dd408bfe5133339548c124529b22312c70f527cca9329a7198c415ee2010e03a967d06d6b56ba25c667c8586476daed97c812ffc26331827aac818eda27282 SHA512 0a1137cf5ed2859dd3876867c4f63b74f117847276a3d9de67736a92cbe5a0c9b2e599bb0e84664f5feb89be36188baacdcc2aa233b498fcfeb6fd946c8b73ea |
35 |
|
36 |
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.7.12-kernel-4.20-compat.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.7.12-kernel-4.20-compat.patch |
37 |
deleted file mode 100644 |
38 |
index 75ed3c57992..00000000000 |
39 |
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.7.12-kernel-4.20-compat.patch |
40 |
+++ /dev/null |
41 |
@@ -1,31 +0,0 @@ |
42 |
-From 4f981f6ab614a908f912f7dc147b248f96b498a2 Mon Sep 17 00:00:00 2001 |
43 |
-From: satmandu <satadru@×××××.edu> |
44 |
-Date: Wed, 26 Dec 2018 12:36:28 -0500 |
45 |
-Subject: [PATCH] Additional fixes for current_kernel_time in 4.20 on 0.7.x |
46 |
- |
47 |
-While https://github.com/zfsonlinux/spl/commit/cd1b28e0cfa923db988611df28958f7b84b53530 fixed the 4.20 current_kernel_time issues in spl as per https://github.com/zfsonlinux/zfs/pull/8074 in .07.x, current_kernel_time is still being used inside zpios-ctl.h in 0.7.x. |
48 |
- |
49 |
-I believe this may fix this issue in 0.7.x to allow it to compile successfully for kernel 4.2.0. |
50 |
---- |
51 |
- include/zpios-ctl.h | 7 +++++-- |
52 |
- 1 file changed, 5 insertions(+), 2 deletions(-) |
53 |
- |
54 |
-diff --git a/include/zpios-ctl.h b/include/zpios-ctl.h |
55 |
-index f17f1153260..068c9eaf173 100644 |
56 |
---- a/include/zpios-ctl.h |
57 |
-+++ b/include/zpios-ctl.h |
58 |
-@@ -181,9 +181,12 @@ zpios_timespec_t |
59 |
- zpios_timespec_now(void) |
60 |
- { |
61 |
- zpios_timespec_t zts_now; |
62 |
-- struct timespec ts_now; |
63 |
-+ #if defined(HAVE_INODE_TIMESPEC64_TIMES) |
64 |
-+ inode_timespec_t ts_now = current_kernel_time64(); |
65 |
-+ #else |
66 |
-+ inode_timespec_t ts_now = current_kernel_time(); |
67 |
-+ #endif |
68 |
- |
69 |
-- ts_now = current_kernel_time(); |
70 |
- zts_now.ts_sec = ts_now.tv_sec; |
71 |
- zts_now.ts_nsec = ts_now.tv_nsec; |
72 |
- |
73 |
|
74 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild |
75 |
deleted file mode 100644 |
76 |
index d326057ceda..00000000000 |
77 |
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild |
78 |
+++ /dev/null |
79 |
@@ -1,146 +0,0 @@ |
80 |
-# Copyright 1999-2019 Gentoo Authors |
81 |
-# Distributed under the terms of the GNU General Public License v2 |
82 |
- |
83 |
-EAPI="5" |
84 |
- |
85 |
-if [ ${PV} == "9999" ]; then |
86 |
- AUTOTOOLS_AUTORECONF="1" |
87 |
- EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" |
88 |
- inherit git-r3 |
89 |
-else |
90 |
- SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" |
91 |
- S="${WORKDIR}/zfs-${PV}" |
92 |
- KEYWORDS="~amd64" |
93 |
-fi |
94 |
- |
95 |
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils |
96 |
- |
97 |
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" |
98 |
-HOMEPAGE="https://zfsonlinux.org/" |
99 |
- |
100 |
-LICENSE="CDDL debug? ( GPL-2+ )" |
101 |
-SLOT="0" |
102 |
-IUSE="custom-cflags debug +rootfs" |
103 |
-RESTRICT="debug? ( strip ) test" |
104 |
- |
105 |
-DEPEND=" |
106 |
- =sys-kernel/spl-${PV}* |
107 |
- dev-lang/perl |
108 |
- virtual/awk |
109 |
-" |
110 |
- |
111 |
-RDEPEND="${DEPEND} |
112 |
- !sys-fs/zfs-fuse |
113 |
-" |
114 |
- |
115 |
-AT_M4DIR="config" |
116 |
-AUTOTOOLS_IN_SOURCE_BUILD="1" |
117 |
- |
118 |
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) |
119 |
- |
120 |
-pkg_setup() { |
121 |
- linux-info_pkg_setup |
122 |
- CONFIG_CHECK=" |
123 |
- !DEBUG_LOCK_ALLOC |
124 |
- EFI_PARTITION |
125 |
- IOSCHED_NOOP |
126 |
- MODULES |
127 |
- !PAX_KERNEXEC_PLUGIN_METHOD_OR |
128 |
- !TRIM_UNUSED_KSYMS |
129 |
- ZLIB_DEFLATE |
130 |
- ZLIB_INFLATE |
131 |
- " |
132 |
- |
133 |
- use debug && CONFIG_CHECK="${CONFIG_CHECK} |
134 |
- FRAME_POINTER |
135 |
- DEBUG_INFO |
136 |
- !DEBUG_INFO_REDUCED |
137 |
- " |
138 |
- |
139 |
- use rootfs && \ |
140 |
- CONFIG_CHECK="${CONFIG_CHECK} |
141 |
- BLK_DEV_INITRD |
142 |
- DEVTMPFS |
143 |
- " |
144 |
- |
145 |
- kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
146 |
- |
147 |
- [ ${PV} != "9999" ] && \ |
148 |
- { kernel_is le 4 18 || die "Linux 4.18 is the latest supported version."; } |
149 |
- |
150 |
- check_extra_config |
151 |
-} |
152 |
- |
153 |
-src_prepare() { |
154 |
- # Remove GPLv2-licensed ZPIOS unless we are debugging |
155 |
- use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" |
156 |
- |
157 |
- # Set module revision number |
158 |
- [ ${PV} != "9999" ] && \ |
159 |
- { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } |
160 |
- |
161 |
- autotools-utils_src_prepare |
162 |
-} |
163 |
- |
164 |
-src_configure() { |
165 |
- local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" |
166 |
- use custom-cflags || strip-flags |
167 |
- filter-ldflags -Wl,* |
168 |
- |
169 |
- set_arch_to_kernel |
170 |
- local myeconfargs=(${myeconfargs} |
171 |
- --bindir="${EPREFIX}/bin" |
172 |
- --sbindir="${EPREFIX}/sbin" |
173 |
- --with-config=kernel |
174 |
- --with-linux="${KV_DIR}" |
175 |
- --with-linux-obj="${KV_OUT_DIR}" |
176 |
- --with-spl="${EROOT}usr/src/${SPL_PATH}" |
177 |
- --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" |
178 |
- $(use_enable debug) |
179 |
- ) |
180 |
- |
181 |
- autotools-utils_src_configure |
182 |
-} |
183 |
- |
184 |
-src_install() { |
185 |
- autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" |
186 |
-} |
187 |
- |
188 |
-pkg_postinst() { |
189 |
- linux-mod_pkg_postinst |
190 |
- |
191 |
- # Remove old modules |
192 |
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] |
193 |
- then |
194 |
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" |
195 |
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" |
196 |
- ewarn "Automatically removing old modules to avoid problems." |
197 |
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" |
198 |
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
199 |
- fi |
200 |
- |
201 |
- if use x86 || use arm |
202 |
- then |
203 |
- ewarn "32-bit kernels will likely require increasing vmalloc to" |
204 |
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |
205 |
- fi |
206 |
- |
207 |
- ewarn "This version of ZFSOnLinux includes support for new feature flags" |
208 |
- ewarn "that are incompatible with previous versions. GRUB2 support for" |
209 |
- ewarn "/boot with the new feature flags is not yet available." |
210 |
- ewarn "Do *NOT* upgrade root pools to use the new feature flags." |
211 |
- ewarn "Any new pools will be created with the new feature flags by default" |
212 |
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To" |
213 |
- ewarn "create a newpool that is backward compatible wih GRUB2, use " |
214 |
- ewarn |
215 |
- ewarn "zpool create -d -o feature@async_destroy=enabled " |
216 |
- ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" |
217 |
- ewarn " -o feature@spacemap_histogram=enabled" |
218 |
- ewarn " -o feature@enabled_txg=enabled " |
219 |
- ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" |
220 |
- ewarn " ..." |
221 |
- ewarn |
222 |
- ewarn "GRUB2 support will be updated as soon as either the GRUB2" |
223 |
- ewarn "developers do a tag or the Gentoo developers find time to backport" |
224 |
- ewarn "support from GRUB2 HEAD." |
225 |
-} |
226 |
|
227 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.12-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.12-r1.ebuild |
228 |
deleted file mode 100644 |
229 |
index ad9bf31d87c..00000000000 |
230 |
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.12-r1.ebuild |
231 |
+++ /dev/null |
232 |
@@ -1,148 +0,0 @@ |
233 |
-# Copyright 1999-2019 Gentoo Authors |
234 |
-# Distributed under the terms of the GNU General Public License v2 |
235 |
- |
236 |
-EAPI="5" |
237 |
- |
238 |
-if [ ${PV} == "9999" ]; then |
239 |
- AUTOTOOLS_AUTORECONF="1" |
240 |
- EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" |
241 |
- inherit git-r3 |
242 |
-else |
243 |
- SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" |
244 |
- S="${WORKDIR}/zfs-${PV}" |
245 |
- KEYWORDS="~amd64" |
246 |
-fi |
247 |
- |
248 |
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils |
249 |
- |
250 |
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" |
251 |
-HOMEPAGE="https://zfsonlinux.org/" |
252 |
- |
253 |
-LICENSE="CDDL debug? ( GPL-2+ )" |
254 |
-SLOT="0" |
255 |
-IUSE="custom-cflags debug +rootfs" |
256 |
-RESTRICT="debug? ( strip ) test" |
257 |
- |
258 |
-DEPEND=" |
259 |
- =sys-kernel/spl-${PV}* |
260 |
- dev-lang/perl |
261 |
- virtual/awk |
262 |
-" |
263 |
- |
264 |
-RDEPEND="${DEPEND} |
265 |
- !sys-fs/zfs-fuse |
266 |
-" |
267 |
- |
268 |
-AT_M4DIR="config" |
269 |
-AUTOTOOLS_IN_SOURCE_BUILD="1" |
270 |
- |
271 |
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) |
272 |
- |
273 |
-PATCHES=( "${FILESDIR}/${P}-kernel-4.20-compat.patch" ) |
274 |
- |
275 |
-pkg_setup() { |
276 |
- linux-info_pkg_setup |
277 |
- CONFIG_CHECK=" |
278 |
- !DEBUG_LOCK_ALLOC |
279 |
- EFI_PARTITION |
280 |
- IOSCHED_NOOP |
281 |
- MODULES |
282 |
- !PAX_KERNEXEC_PLUGIN_METHOD_OR |
283 |
- !TRIM_UNUSED_KSYMS |
284 |
- ZLIB_DEFLATE |
285 |
- ZLIB_INFLATE |
286 |
- " |
287 |
- |
288 |
- use debug && CONFIG_CHECK="${CONFIG_CHECK} |
289 |
- FRAME_POINTER |
290 |
- DEBUG_INFO |
291 |
- !DEBUG_INFO_REDUCED |
292 |
- " |
293 |
- |
294 |
- use rootfs && \ |
295 |
- CONFIG_CHECK="${CONFIG_CHECK} |
296 |
- BLK_DEV_INITRD |
297 |
- DEVTMPFS |
298 |
- " |
299 |
- |
300 |
- kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
301 |
- |
302 |
- [ ${PV} != "9999" ] && \ |
303 |
- { kernel_is le 4 20 || die "Linux 4.20 is the latest supported version."; } |
304 |
- |
305 |
- check_extra_config |
306 |
-} |
307 |
- |
308 |
-src_prepare() { |
309 |
- # Remove GPLv2-licensed ZPIOS unless we are debugging |
310 |
- use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" |
311 |
- |
312 |
- # Set module revision number |
313 |
- [ ${PV} != "9999" ] && \ |
314 |
- { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } |
315 |
- |
316 |
- autotools-utils_src_prepare |
317 |
-} |
318 |
- |
319 |
-src_configure() { |
320 |
- local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" |
321 |
- use custom-cflags || strip-flags |
322 |
- filter-ldflags -Wl,* |
323 |
- |
324 |
- set_arch_to_kernel |
325 |
- local myeconfargs=(${myeconfargs} |
326 |
- --bindir="${EPREFIX}/bin" |
327 |
- --sbindir="${EPREFIX}/sbin" |
328 |
- --with-config=kernel |
329 |
- --with-linux="${KV_DIR}" |
330 |
- --with-linux-obj="${KV_OUT_DIR}" |
331 |
- --with-spl="${EROOT}usr/src/${SPL_PATH}" |
332 |
- --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" |
333 |
- $(use_enable debug) |
334 |
- ) |
335 |
- |
336 |
- autotools-utils_src_configure |
337 |
-} |
338 |
- |
339 |
-src_install() { |
340 |
- autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" |
341 |
-} |
342 |
- |
343 |
-pkg_postinst() { |
344 |
- linux-mod_pkg_postinst |
345 |
- |
346 |
- # Remove old modules |
347 |
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] |
348 |
- then |
349 |
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" |
350 |
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" |
351 |
- ewarn "Automatically removing old modules to avoid problems." |
352 |
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" |
353 |
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
354 |
- fi |
355 |
- |
356 |
- if use x86 || use arm |
357 |
- then |
358 |
- ewarn "32-bit kernels will likely require increasing vmalloc to" |
359 |
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |
360 |
- fi |
361 |
- |
362 |
- ewarn "This version of ZFSOnLinux includes support for new feature flags" |
363 |
- ewarn "that are incompatible with previous versions. GRUB2 support for" |
364 |
- ewarn "/boot with the new feature flags is not yet available." |
365 |
- ewarn "Do *NOT* upgrade root pools to use the new feature flags." |
366 |
- ewarn "Any new pools will be created with the new feature flags by default" |
367 |
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To" |
368 |
- ewarn "create a newpool that is backward compatible wih GRUB2, use " |
369 |
- ewarn |
370 |
- ewarn "zpool create -d -o feature@async_destroy=enabled " |
371 |
- ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" |
372 |
- ewarn " -o feature@spacemap_histogram=enabled" |
373 |
- ewarn " -o feature@enabled_txg=enabled " |
374 |
- ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" |
375 |
- ewarn " ..." |
376 |
- ewarn |
377 |
- ewarn "GRUB2 support will be updated as soon as either the GRUB2" |
378 |
- ewarn "developers do a tag or the Gentoo developers find time to backport" |
379 |
- ewarn "support from GRUB2 HEAD." |
380 |
-} |
381 |
|
382 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.8.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.8.ebuild |
383 |
deleted file mode 100644 |
384 |
index aa482377473..00000000000 |
385 |
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.8.ebuild |
386 |
+++ /dev/null |
387 |
@@ -1,146 +0,0 @@ |
388 |
-# Copyright 1999-2019 Gentoo Authors |
389 |
-# Distributed under the terms of the GNU General Public License v2 |
390 |
- |
391 |
-EAPI="5" |
392 |
- |
393 |
-if [ ${PV} == "9999" ]; then |
394 |
- AUTOTOOLS_AUTORECONF="1" |
395 |
- EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" |
396 |
- inherit git-r3 |
397 |
-else |
398 |
- SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" |
399 |
- S="${WORKDIR}/zfs-${PV}" |
400 |
- KEYWORDS="amd64" |
401 |
-fi |
402 |
- |
403 |
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils |
404 |
- |
405 |
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" |
406 |
-HOMEPAGE="https://zfsonlinux.org/" |
407 |
- |
408 |
-LICENSE="CDDL debug? ( GPL-2+ )" |
409 |
-SLOT="0" |
410 |
-IUSE="custom-cflags debug +rootfs" |
411 |
-RESTRICT="debug? ( strip ) test" |
412 |
- |
413 |
-DEPEND=" |
414 |
- =sys-kernel/spl-${PV}* |
415 |
- dev-lang/perl |
416 |
- virtual/awk |
417 |
-" |
418 |
- |
419 |
-RDEPEND="${DEPEND} |
420 |
- !sys-fs/zfs-fuse |
421 |
-" |
422 |
- |
423 |
-AT_M4DIR="config" |
424 |
-AUTOTOOLS_IN_SOURCE_BUILD="1" |
425 |
- |
426 |
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) |
427 |
- |
428 |
-pkg_setup() { |
429 |
- linux-info_pkg_setup |
430 |
- CONFIG_CHECK=" |
431 |
- !DEBUG_LOCK_ALLOC |
432 |
- EFI_PARTITION |
433 |
- IOSCHED_NOOP |
434 |
- MODULES |
435 |
- !PAX_KERNEXEC_PLUGIN_METHOD_OR |
436 |
- !TRIM_UNUSED_KSYMS |
437 |
- ZLIB_DEFLATE |
438 |
- ZLIB_INFLATE |
439 |
- " |
440 |
- |
441 |
- use debug && CONFIG_CHECK="${CONFIG_CHECK} |
442 |
- FRAME_POINTER |
443 |
- DEBUG_INFO |
444 |
- !DEBUG_INFO_REDUCED |
445 |
- " |
446 |
- |
447 |
- use rootfs && \ |
448 |
- CONFIG_CHECK="${CONFIG_CHECK} |
449 |
- BLK_DEV_INITRD |
450 |
- DEVTMPFS |
451 |
- " |
452 |
- |
453 |
- kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
454 |
- |
455 |
- [ ${PV} != "9999" ] && \ |
456 |
- { kernel_is le 4 16 || die "Linux 4.16 is the latest supported version."; } |
457 |
- |
458 |
- check_extra_config |
459 |
-} |
460 |
- |
461 |
-src_prepare() { |
462 |
- # Remove GPLv2-licensed ZPIOS unless we are debugging |
463 |
- use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" |
464 |
- |
465 |
- # Set module revision number |
466 |
- [ ${PV} != "9999" ] && \ |
467 |
- { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } |
468 |
- |
469 |
- autotools-utils_src_prepare |
470 |
-} |
471 |
- |
472 |
-src_configure() { |
473 |
- local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" |
474 |
- use custom-cflags || strip-flags |
475 |
- filter-ldflags -Wl,* |
476 |
- |
477 |
- set_arch_to_kernel |
478 |
- local myeconfargs=(${myeconfargs} |
479 |
- --bindir="${EPREFIX}/bin" |
480 |
- --sbindir="${EPREFIX}/sbin" |
481 |
- --with-config=kernel |
482 |
- --with-linux="${KV_DIR}" |
483 |
- --with-linux-obj="${KV_OUT_DIR}" |
484 |
- --with-spl="${EROOT}usr/src/${SPL_PATH}" |
485 |
- --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" |
486 |
- $(use_enable debug) |
487 |
- ) |
488 |
- |
489 |
- autotools-utils_src_configure |
490 |
-} |
491 |
- |
492 |
-src_install() { |
493 |
- autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" |
494 |
-} |
495 |
- |
496 |
-pkg_postinst() { |
497 |
- linux-mod_pkg_postinst |
498 |
- |
499 |
- # Remove old modules |
500 |
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] |
501 |
- then |
502 |
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" |
503 |
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" |
504 |
- ewarn "Automatically removing old modules to avoid problems." |
505 |
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" |
506 |
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
507 |
- fi |
508 |
- |
509 |
- if use x86 || use arm |
510 |
- then |
511 |
- ewarn "32-bit kernels will likely require increasing vmalloc to" |
512 |
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |
513 |
- fi |
514 |
- |
515 |
- ewarn "This version of ZFSOnLinux includes support for new feature flags" |
516 |
- ewarn "that are incompatible with previous versions. GRUB2 support for" |
517 |
- ewarn "/boot with the new feature flags is not yet available." |
518 |
- ewarn "Do *NOT* upgrade root pools to use the new feature flags." |
519 |
- ewarn "Any new pools will be created with the new feature flags by default" |
520 |
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To" |
521 |
- ewarn "create a newpool that is backward compatible wih GRUB2, use " |
522 |
- ewarn |
523 |
- ewarn "zpool create -d -o feature@async_destroy=enabled " |
524 |
- ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" |
525 |
- ewarn " -o feature@spacemap_histogram=enabled" |
526 |
- ewarn " -o feature@enabled_txg=enabled " |
527 |
- ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" |
528 |
- ewarn " ..." |
529 |
- ewarn |
530 |
- ewarn "GRUB2 support will be updated as soon as either the GRUB2" |
531 |
- ewarn "developers do a tag or the Gentoo developers find time to backport" |
532 |
- ewarn "support from GRUB2 HEAD." |
533 |
-} |
534 |
|
535 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9-r1.ebuild |
536 |
deleted file mode 100644 |
537 |
index c702d6ed35b..00000000000 |
538 |
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.9-r1.ebuild |
539 |
+++ /dev/null |
540 |
@@ -1,155 +0,0 @@ |
541 |
-# Copyright 1999-2019 Gentoo Authors |
542 |
-# Distributed under the terms of the GNU General Public License v2 |
543 |
- |
544 |
-EAPI="5" |
545 |
- |
546 |
-AUTOTOOLS_AUTORECONF="1" |
547 |
-if [ ${PV} == "9999" ]; then |
548 |
- EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" |
549 |
- inherit git-r3 |
550 |
-else |
551 |
- SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz |
552 |
- https://dev.gentoo.org/~ryao/dist/zfs-${PVR}-patches.tar.xz" |
553 |
- S="${WORKDIR}/zfs-${PV}" |
554 |
- KEYWORDS="~amd64" |
555 |
-fi |
556 |
- |
557 |
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils |
558 |
- |
559 |
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" |
560 |
-HOMEPAGE="https://zfsonlinux.org/" |
561 |
- |
562 |
-LICENSE="CDDL debug? ( GPL-2+ )" |
563 |
-SLOT="0" |
564 |
-IUSE="custom-cflags debug +rootfs" |
565 |
-RESTRICT="debug? ( strip ) test" |
566 |
- |
567 |
-DEPEND=" |
568 |
- =sys-kernel/spl-${PVR} |
569 |
- dev-lang/perl |
570 |
- virtual/awk |
571 |
-" |
572 |
- |
573 |
-RDEPEND="${DEPEND} |
574 |
- !sys-fs/zfs-fuse |
575 |
-" |
576 |
- |
577 |
-AT_M4DIR="config" |
578 |
-AUTOTOOLS_IN_SOURCE_BUILD="1" |
579 |
- |
580 |
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) |
581 |
- |
582 |
-pkg_setup() { |
583 |
- linux-info_pkg_setup |
584 |
- CONFIG_CHECK=" |
585 |
- !DEBUG_LOCK_ALLOC |
586 |
- EFI_PARTITION |
587 |
- IOSCHED_NOOP |
588 |
- MODULES |
589 |
- !PAX_KERNEXEC_PLUGIN_METHOD_OR |
590 |
- !TRIM_UNUSED_KSYMS |
591 |
- ZLIB_DEFLATE |
592 |
- ZLIB_INFLATE |
593 |
- " |
594 |
- |
595 |
- use debug && CONFIG_CHECK="${CONFIG_CHECK} |
596 |
- FRAME_POINTER |
597 |
- DEBUG_INFO |
598 |
- !DEBUG_INFO_REDUCED |
599 |
- " |
600 |
- |
601 |
- use rootfs && \ |
602 |
- CONFIG_CHECK="${CONFIG_CHECK} |
603 |
- BLK_DEV_INITRD |
604 |
- DEVTMPFS |
605 |
- " |
606 |
- |
607 |
- kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
608 |
- |
609 |
- [ ${PV} != "9999" ] && \ |
610 |
- { kernel_is le 4 18 || die "Linux 4.18 is the latest supported version."; } |
611 |
- |
612 |
- check_extra_config |
613 |
-} |
614 |
- |
615 |
-src_prepare() { |
616 |
- if [ ${PV} != "9999" ] |
617 |
- then |
618 |
- # Apply patch set |
619 |
- EPATCH_SUFFIX="patch" \ |
620 |
- EPATCH_FORCE="yes" \ |
621 |
- epatch "${WORKDIR}/zfs-${PVR}-patches" |
622 |
- fi |
623 |
- |
624 |
- # Remove GPLv2-licensed ZPIOS unless we are debugging |
625 |
- use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" |
626 |
- |
627 |
- # Set module revision number |
628 |
- [ ${PV} != "9999" ] && \ |
629 |
- { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } |
630 |
- |
631 |
- autotools-utils_src_prepare |
632 |
-} |
633 |
- |
634 |
-src_configure() { |
635 |
- local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" |
636 |
- use custom-cflags || strip-flags |
637 |
- filter-ldflags -Wl,* |
638 |
- |
639 |
- set_arch_to_kernel |
640 |
- local myeconfargs=(${myeconfargs} |
641 |
- --bindir="${EPREFIX}/bin" |
642 |
- --sbindir="${EPREFIX}/sbin" |
643 |
- --with-config=kernel |
644 |
- --with-linux="${KV_DIR}" |
645 |
- --with-linux-obj="${KV_OUT_DIR}" |
646 |
- --with-spl="${EROOT}usr/src/${SPL_PATH}" |
647 |
- --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" |
648 |
- $(use_enable debug) |
649 |
- ) |
650 |
- |
651 |
- autotools-utils_src_configure |
652 |
-} |
653 |
- |
654 |
-src_install() { |
655 |
- autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" |
656 |
-} |
657 |
- |
658 |
-pkg_postinst() { |
659 |
- linux-mod_pkg_postinst |
660 |
- |
661 |
- # Remove old modules |
662 |
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] |
663 |
- then |
664 |
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" |
665 |
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" |
666 |
- ewarn "Automatically removing old modules to avoid problems." |
667 |
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" |
668 |
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
669 |
- fi |
670 |
- |
671 |
- if use x86 || use arm |
672 |
- then |
673 |
- ewarn "32-bit kernels will likely require increasing vmalloc to" |
674 |
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |
675 |
- fi |
676 |
- |
677 |
- ewarn "This version of ZFSOnLinux includes support for new feature flags" |
678 |
- ewarn "that are incompatible with previous versions. GRUB2 support for" |
679 |
- ewarn "/boot with the new feature flags is not yet available." |
680 |
- ewarn "Do *NOT* upgrade root pools to use the new feature flags." |
681 |
- ewarn "Any new pools will be created with the new feature flags by default" |
682 |
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To" |
683 |
- ewarn "create a newpool that is backward compatible wih GRUB2, use " |
684 |
- ewarn |
685 |
- ewarn "zpool create -d -o feature@async_destroy=enabled " |
686 |
- ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" |
687 |
- ewarn " -o feature@spacemap_histogram=enabled" |
688 |
- ewarn " -o feature@enabled_txg=enabled " |
689 |
- ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" |
690 |
- ewarn " ..." |
691 |
- ewarn |
692 |
- ewarn "GRUB2 support will be updated as soon as either the GRUB2" |
693 |
- ewarn "developers do a tag or the Gentoo developers find time to backport" |
694 |
- ewarn "support from GRUB2 HEAD." |
695 |
-} |
696 |
|
697 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild |
698 |
deleted file mode 100644 |
699 |
index c0e759e6be3..00000000000 |
700 |
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild |
701 |
+++ /dev/null |
702 |
@@ -1,146 +0,0 @@ |
703 |
-# Copyright 1999-2019 Gentoo Authors |
704 |
-# Distributed under the terms of the GNU General Public License v2 |
705 |
- |
706 |
-EAPI="5" |
707 |
- |
708 |
-if [ ${PV} == "9999" ]; then |
709 |
- AUTOTOOLS_AUTORECONF="1" |
710 |
- EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" |
711 |
- inherit git-r3 |
712 |
-else |
713 |
- SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" |
714 |
- S="${WORKDIR}/zfs-${PV}" |
715 |
- KEYWORDS="amd64" |
716 |
-fi |
717 |
- |
718 |
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils |
719 |
- |
720 |
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" |
721 |
-HOMEPAGE="https://zfsonlinux.org/" |
722 |
- |
723 |
-LICENSE="CDDL debug? ( GPL-2+ )" |
724 |
-SLOT="0" |
725 |
-IUSE="custom-cflags debug +rootfs" |
726 |
-RESTRICT="debug? ( strip ) test" |
727 |
- |
728 |
-DEPEND=" |
729 |
- =sys-kernel/spl-${PV}* |
730 |
- dev-lang/perl |
731 |
- virtual/awk |
732 |
-" |
733 |
- |
734 |
-RDEPEND="${DEPEND} |
735 |
- !sys-fs/zfs-fuse |
736 |
-" |
737 |
- |
738 |
-AT_M4DIR="config" |
739 |
-AUTOTOOLS_IN_SOURCE_BUILD="1" |
740 |
- |
741 |
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) |
742 |
- |
743 |
-pkg_setup() { |
744 |
- linux-info_pkg_setup |
745 |
- CONFIG_CHECK=" |
746 |
- !DEBUG_LOCK_ALLOC |
747 |
- EFI_PARTITION |
748 |
- IOSCHED_NOOP |
749 |
- MODULES |
750 |
- !PAX_KERNEXEC_PLUGIN_METHOD_OR |
751 |
- !TRIM_UNUSED_KSYMS |
752 |
- ZLIB_DEFLATE |
753 |
- ZLIB_INFLATE |
754 |
- " |
755 |
- |
756 |
- use debug && CONFIG_CHECK="${CONFIG_CHECK} |
757 |
- FRAME_POINTER |
758 |
- DEBUG_INFO |
759 |
- !DEBUG_INFO_REDUCED |
760 |
- " |
761 |
- |
762 |
- use rootfs && \ |
763 |
- CONFIG_CHECK="${CONFIG_CHECK} |
764 |
- BLK_DEV_INITRD |
765 |
- DEVTMPFS |
766 |
- " |
767 |
- |
768 |
- kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
769 |
- |
770 |
- [ ${PV} != "9999" ] && \ |
771 |
- { kernel_is le 4 17 || die "Linux 4.17 is the latest supported version."; } |
772 |
- |
773 |
- check_extra_config |
774 |
-} |
775 |
- |
776 |
-src_prepare() { |
777 |
- # Remove GPLv2-licensed ZPIOS unless we are debugging |
778 |
- use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" |
779 |
- |
780 |
- # Set module revision number |
781 |
- [ ${PV} != "9999" ] && \ |
782 |
- { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } |
783 |
- |
784 |
- autotools-utils_src_prepare |
785 |
-} |
786 |
- |
787 |
-src_configure() { |
788 |
- local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" |
789 |
- use custom-cflags || strip-flags |
790 |
- filter-ldflags -Wl,* |
791 |
- |
792 |
- set_arch_to_kernel |
793 |
- local myeconfargs=(${myeconfargs} |
794 |
- --bindir="${EPREFIX}/bin" |
795 |
- --sbindir="${EPREFIX}/sbin" |
796 |
- --with-config=kernel |
797 |
- --with-linux="${KV_DIR}" |
798 |
- --with-linux-obj="${KV_OUT_DIR}" |
799 |
- --with-spl="${EROOT}usr/src/${SPL_PATH}" |
800 |
- --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" |
801 |
- $(use_enable debug) |
802 |
- ) |
803 |
- |
804 |
- autotools-utils_src_configure |
805 |
-} |
806 |
- |
807 |
-src_install() { |
808 |
- autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" |
809 |
-} |
810 |
- |
811 |
-pkg_postinst() { |
812 |
- linux-mod_pkg_postinst |
813 |
- |
814 |
- # Remove old modules |
815 |
- if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] |
816 |
- then |
817 |
- ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" |
818 |
- ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" |
819 |
- ewarn "Automatically removing old modules to avoid problems." |
820 |
- rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" |
821 |
- rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
822 |
- fi |
823 |
- |
824 |
- if use x86 || use arm |
825 |
- then |
826 |
- ewarn "32-bit kernels will likely require increasing vmalloc to" |
827 |
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |
828 |
- fi |
829 |
- |
830 |
- ewarn "This version of ZFSOnLinux includes support for new feature flags" |
831 |
- ewarn "that are incompatible with previous versions. GRUB2 support for" |
832 |
- ewarn "/boot with the new feature flags is not yet available." |
833 |
- ewarn "Do *NOT* upgrade root pools to use the new feature flags." |
834 |
- ewarn "Any new pools will be created with the new feature flags by default" |
835 |
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To" |
836 |
- ewarn "create a newpool that is backward compatible wih GRUB2, use " |
837 |
- ewarn |
838 |
- ewarn "zpool create -d -o feature@async_destroy=enabled " |
839 |
- ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" |
840 |
- ewarn " -o feature@spacemap_histogram=enabled" |
841 |
- ewarn " -o feature@enabled_txg=enabled " |
842 |
- ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" |
843 |
- ewarn " ..." |
844 |
- ewarn |
845 |
- ewarn "GRUB2 support will be updated as soon as either the GRUB2" |
846 |
- ewarn "developers do a tag or the Gentoo developers find time to backport" |
847 |
- ewarn "support from GRUB2 HEAD." |
848 |
-} |