Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
Date: Tue, 01 Dec 2020 19:04:12
Message-Id: 1606849424.287210029fd63148ab51b03f84df09c3c3bf7a97.gyakovlev@gentoo
1 commit: 287210029fd63148ab51b03f84df09c3c3bf7a97
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 1 19:00:56 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 1 19:03:44 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28721002
7
8 sys-fs/zfs-kmod: remove rc ebuilds
9
10 Package-Manager: Portage-3.0.11, Repoman-3.0.2
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 sys-fs/zfs-kmod/Manifest | 2 -
14 sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild | 175 ------------------------------
15 sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild | 175 ------------------------------
16 3 files changed, 352 deletions(-)
17
18 diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
19 index 3681a1f8b22..c61bfe7fb31 100644
20 --- a/sys-fs/zfs-kmod/Manifest
21 +++ b/sys-fs/zfs-kmod/Manifest
22 @@ -1,4 +1,2 @@
23 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
24 -DIST zfs-2.0.0-rc6.tar.gz 12896465 BLAKE2B e7a91d980940998a7312d48a43c07561e3b1aa72cc6f88eb534cb39b5e18de4280964ba7f690b63f5e2dd3cfdeb57d718d7389f8ab2062ff7bb6e8bb4174801a SHA512 5daf8d39766f8c8f8bca340585ae36c39507e33642a7cd2dadb74bbe1d529d5be40420057edc95814c0b554121128c0ebde59c3fbed17259870b123a56acd2e8
25 -DIST zfs-2.0.0-rc7.tar.gz 12994030 BLAKE2B 12dde3b935cddabd3d3e5874685cd914f0338526ba8d22aaba2b1ff09aae64a67cc66ea0acc7d08cdc438fd8dfc93a2727bab5e90c08c2a294074692f4189214 SHA512 fbef7bc76c2b913ef8c4af55e6feb46bcadbca856b8ba28c72432bb91b8dc88de191d657aaeb5efd67ee2d67a6ffcf5d3d53b4490f9a32211a571687694e7e65
26 DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f
27
28 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild
29 deleted file mode 100644
30 index 81328da6d29..00000000000
31 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild
32 +++ /dev/null
33 @@ -1,175 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -inherit autotools flag-o-matic linux-mod toolchain-funcs
40 -
41 -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
42 -HOMEPAGE="https://github.com/openzfs/zfs"
43 -
44 -if [[ ${PV} == "9999" ]]; then
45 - inherit git-r3
46 - EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
47 -else
48 - MY_PV="${PV/_rc/-rc}"
49 - SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
50 - KEYWORDS="~amd64 ~arm64 ~ppc64"
51 - S="${WORKDIR}/zfs-${PV%_rc?}"
52 - ZFS_KERNEL_COMPAT="5.9"
53 -fi
54 -
55 -LICENSE="CDDL MIT debug? ( GPL-2+ )"
56 -SLOT="0"
57 -IUSE="custom-cflags debug +rootfs"
58 -
59 -DEPEND=""
60 -
61 -RDEPEND="${DEPEND}
62 - !sys-kernel/spl
63 -"
64 -
65 -BDEPEND="
66 - dev-lang/perl
67 - virtual/awk
68 -"
69 -
70 -RESTRICT="debug? ( strip ) test"
71 -
72 -DOCS=( AUTHORS COPYRIGHT META README.md )
73 -
74 -pkg_setup() {
75 - CONFIG_CHECK="
76 - !DEBUG_LOCK_ALLOC
77 - EFI_PARTITION
78 - MODULES
79 - !PAX_KERNEXEC_PLUGIN_METHOD_OR
80 - !TRIM_UNUSED_KSYMS
81 - ZLIB_DEFLATE
82 - ZLIB_INFLATE
83 - "
84 -
85 - use debug && CONFIG_CHECK="${CONFIG_CHECK}
86 - FRAME_POINTER
87 - DEBUG_INFO
88 - !DEBUG_INFO_REDUCED
89 - "
90 -
91 - use rootfs && \
92 - CONFIG_CHECK="${CONFIG_CHECK}
93 - BLK_DEV_INITRD
94 - DEVTMPFS
95 - "
96 -
97 - kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
98 -
99 - if [[ ${PV} != "9999" ]]; then
100 - local kv_major_max kv_minor_max zcompat
101 - zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
102 - kv_major_max="${zcompat%%.*}"
103 - zcompat="${zcompat#*.}"
104 - kv_minor_max="${zcompat%%.*}"
105 - kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
106 - "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
107 -
108 - fi
109 -
110 - kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
111 -
112 - linux-mod_pkg_setup
113 -}
114 -
115 -src_prepare() {
116 - default
117 -
118 - if [[ ${PV} == "9999" ]]; then
119 - eautoreconf
120 - else
121 - # Set module revision number
122 - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
123 - fi
124 -}
125 -
126 -src_configure() {
127 - set_arch_to_kernel
128 -
129 - use custom-cflags || strip-flags
130 -
131 - filter-ldflags -Wl,*
132 -
133 - local myconf=(
134 - CROSS_COMPILE="${CHOST}-"
135 - HOSTCC="$(tc-getBUILD_CC)"
136 - --bindir="${EPREFIX}/bin"
137 - --sbindir="${EPREFIX}/sbin"
138 - --with-config=kernel
139 - --with-linux="${KV_DIR}"
140 - --with-linux-obj="${KV_OUT_DIR}"
141 - $(use_enable debug)
142 - )
143 -
144 - econf "${myconf[@]}"
145 -}
146 -
147 -src_compile() {
148 - set_arch_to_kernel
149 -
150 - myemakeargs=(
151 - CROSS_COMPILE="${CHOST}-"
152 - HOSTCC="$(tc-getBUILD_CC)"
153 - V=1
154 - )
155 -
156 - emake "${myemakeargs[@]}"
157 -}
158 -
159 -src_install() {
160 - set_arch_to_kernel
161 -
162 - myemakeargs+=(
163 - DEPMOD="/bin/true"
164 - DESTDIR="${D}"
165 - INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
166 - )
167 -
168 - emake "${myemakeargs[@]}" install
169 -
170 - einstalldocs
171 -}
172 -
173 -pkg_postinst() {
174 - linux-mod_pkg_postinst
175 -
176 - # Remove old modules
177 - if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
178 - ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
179 - ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
180 - ewarn "Automatically removing old modules to avoid problems."
181 - rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
182 - rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
183 - fi
184 -
185 - if use x86 || use arm; then
186 - ewarn "32-bit kernels will likely require increasing vmalloc to"
187 - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
188 - fi
189 -
190 - ewarn "This version of OpenZFS includes support for new feature flags"
191 - ewarn "that are incompatible with previous versions. GRUB2 support for"
192 - ewarn "/boot with the new feature flags is not yet available."
193 - ewarn "Do *NOT* upgrade root pools to use the new feature flags."
194 - ewarn "Any new pools will be created with the new feature flags by default"
195 - ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
196 - ewarn "create a newpool that is backward compatible wih GRUB2, use "
197 - ewarn
198 - ewarn "zpool create -d -o feature@async_destroy=enabled "
199 - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
200 - ewarn " -o feature@spacemap_histogram=enabled"
201 - ewarn " -o feature@enabled_txg=enabled "
202 - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
203 - ewarn " ..."
204 - ewarn
205 - ewarn "GRUB2 support will be updated as soon as either the GRUB2"
206 - ewarn "developers do a tag or the Gentoo developers find time to backport"
207 - ewarn "support from GRUB2 HEAD."
208 -}
209
210 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild
211 deleted file mode 100644
212 index 81328da6d29..00000000000
213 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild
214 +++ /dev/null
215 @@ -1,175 +0,0 @@
216 -# Copyright 1999-2020 Gentoo Authors
217 -# Distributed under the terms of the GNU General Public License v2
218 -
219 -EAPI=7
220 -
221 -inherit autotools flag-o-matic linux-mod toolchain-funcs
222 -
223 -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
224 -HOMEPAGE="https://github.com/openzfs/zfs"
225 -
226 -if [[ ${PV} == "9999" ]]; then
227 - inherit git-r3
228 - EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
229 -else
230 - MY_PV="${PV/_rc/-rc}"
231 - SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
232 - KEYWORDS="~amd64 ~arm64 ~ppc64"
233 - S="${WORKDIR}/zfs-${PV%_rc?}"
234 - ZFS_KERNEL_COMPAT="5.9"
235 -fi
236 -
237 -LICENSE="CDDL MIT debug? ( GPL-2+ )"
238 -SLOT="0"
239 -IUSE="custom-cflags debug +rootfs"
240 -
241 -DEPEND=""
242 -
243 -RDEPEND="${DEPEND}
244 - !sys-kernel/spl
245 -"
246 -
247 -BDEPEND="
248 - dev-lang/perl
249 - virtual/awk
250 -"
251 -
252 -RESTRICT="debug? ( strip ) test"
253 -
254 -DOCS=( AUTHORS COPYRIGHT META README.md )
255 -
256 -pkg_setup() {
257 - CONFIG_CHECK="
258 - !DEBUG_LOCK_ALLOC
259 - EFI_PARTITION
260 - MODULES
261 - !PAX_KERNEXEC_PLUGIN_METHOD_OR
262 - !TRIM_UNUSED_KSYMS
263 - ZLIB_DEFLATE
264 - ZLIB_INFLATE
265 - "
266 -
267 - use debug && CONFIG_CHECK="${CONFIG_CHECK}
268 - FRAME_POINTER
269 - DEBUG_INFO
270 - !DEBUG_INFO_REDUCED
271 - "
272 -
273 - use rootfs && \
274 - CONFIG_CHECK="${CONFIG_CHECK}
275 - BLK_DEV_INITRD
276 - DEVTMPFS
277 - "
278 -
279 - kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
280 -
281 - if [[ ${PV} != "9999" ]]; then
282 - local kv_major_max kv_minor_max zcompat
283 - zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
284 - kv_major_max="${zcompat%%.*}"
285 - zcompat="${zcompat#*.}"
286 - kv_minor_max="${zcompat%%.*}"
287 - kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
288 - "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
289 -
290 - fi
291 -
292 - kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
293 -
294 - linux-mod_pkg_setup
295 -}
296 -
297 -src_prepare() {
298 - default
299 -
300 - if [[ ${PV} == "9999" ]]; then
301 - eautoreconf
302 - else
303 - # Set module revision number
304 - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
305 - fi
306 -}
307 -
308 -src_configure() {
309 - set_arch_to_kernel
310 -
311 - use custom-cflags || strip-flags
312 -
313 - filter-ldflags -Wl,*
314 -
315 - local myconf=(
316 - CROSS_COMPILE="${CHOST}-"
317 - HOSTCC="$(tc-getBUILD_CC)"
318 - --bindir="${EPREFIX}/bin"
319 - --sbindir="${EPREFIX}/sbin"
320 - --with-config=kernel
321 - --with-linux="${KV_DIR}"
322 - --with-linux-obj="${KV_OUT_DIR}"
323 - $(use_enable debug)
324 - )
325 -
326 - econf "${myconf[@]}"
327 -}
328 -
329 -src_compile() {
330 - set_arch_to_kernel
331 -
332 - myemakeargs=(
333 - CROSS_COMPILE="${CHOST}-"
334 - HOSTCC="$(tc-getBUILD_CC)"
335 - V=1
336 - )
337 -
338 - emake "${myemakeargs[@]}"
339 -}
340 -
341 -src_install() {
342 - set_arch_to_kernel
343 -
344 - myemakeargs+=(
345 - DEPMOD="/bin/true"
346 - DESTDIR="${D}"
347 - INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
348 - )
349 -
350 - emake "${myemakeargs[@]}" install
351 -
352 - einstalldocs
353 -}
354 -
355 -pkg_postinst() {
356 - linux-mod_pkg_postinst
357 -
358 - # Remove old modules
359 - if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
360 - ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
361 - ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
362 - ewarn "Automatically removing old modules to avoid problems."
363 - rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
364 - rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
365 - fi
366 -
367 - if use x86 || use arm; then
368 - ewarn "32-bit kernels will likely require increasing vmalloc to"
369 - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
370 - fi
371 -
372 - ewarn "This version of OpenZFS includes support for new feature flags"
373 - ewarn "that are incompatible with previous versions. GRUB2 support for"
374 - ewarn "/boot with the new feature flags is not yet available."
375 - ewarn "Do *NOT* upgrade root pools to use the new feature flags."
376 - ewarn "Any new pools will be created with the new feature flags by default"
377 - ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
378 - ewarn "create a newpool that is backward compatible wih GRUB2, use "
379 - ewarn
380 - ewarn "zpool create -d -o feature@async_destroy=enabled "
381 - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
382 - ewarn " -o feature@spacemap_histogram=enabled"
383 - ewarn " -o feature@enabled_txg=enabled "
384 - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
385 - ewarn " ..."
386 - ewarn
387 - ewarn "GRUB2 support will be updated as soon as either the GRUB2"
388 - ewarn "developers do a tag or the Gentoo developers find time to backport"
389 - ewarn "support from GRUB2 HEAD."
390 -}