Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/
Date: Fri, 11 Jun 2021 02:07:38
Message-Id: 1623376164.34de8825f8e5979b02df0b83217c42ad332a8d11.sam@gentoo
1 commit: 34de8825f8e5979b02df0b83217c42ad332a8d11
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 11 01:49:24 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 11 01:49:24 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34de8825
7
8 sys-fs/zfs-kmod: drop 2.1.0_rc6
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-fs/zfs-kmod/Manifest | 2 -
13 sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc6.ebuild | 204 ------------------------------
14 2 files changed, 206 deletions(-)
15
16 diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
17 index 38ea1c754d6..a5e6c8775b6 100644
18 --- a/sys-fs/zfs-kmod/Manifest
19 +++ b/sys-fs/zfs-kmod/Manifest
20 @@ -1,7 +1,5 @@
21 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
22 DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b
23 -DIST zfs-2.1.0-rc6.tar.gz 34777294 BLAKE2B 0080b03a9cf9717ae2bc7674e340dffafd923467368d8941df9be5a21f081e88745297e1a8b2ac5059e9f346949bbeb759a5fc8bcdb60c3be49b0645389ec8b1 SHA512 696d525c1c738a508d04366f8ffd0142aebe4498efbf129c9d38fa7c67dbec83554f55a2c4a5d7647a03ca0df173c2720fe85edbc859195f4ca19e04d2adf143
24 -DIST zfs-2.1.0-rc6.tar.gz.asc 195 BLAKE2B a1267b8faffc75ac70082e261c6053b2070cbad014c92051ebc82af56b21bbe2e72e01e44c0701ed255a3201330bb56b5e1a72e12c1ae9f15f72883b53c17ec6 SHA512 afc0eb839de6b0b21b3d781dd74dce9f6f668b7b9fc079ea764666e28d4d3228b8a80641b6d0084851bffedfc3406dc0f829242f6b4247d192f554ba45ce3a4c
25 DIST zfs-2.1.0-rc7.tar.gz 34800406 BLAKE2B a645c3e19f521a7abb606cbcd619ea019abeb7810bd6476ecddcd76c7c801d6f1e3f197d49199eac72497db5c529b22bcd605b2e7ec2c236aec5216dc99b7dc1 SHA512 4e1cb1cc83454d92cac58110c219fca28dcf8361a5ea27dca955a5c88434b6e9ccd68892d93bf14d773056760f1907e004e65cc5d653308dd8996692ecba61f1
26 DIST zfs-2.1.0-rc7.tar.gz.asc 195 BLAKE2B b772bba2f64bec51f11b5c51564a1449cd37d5e8e5c90eee1eb5c357193cab187bdeceef299c95622aed9c03601c1b5d67a941de12003c01e0af9ad68e82bfa2 SHA512 6c48eeab7658db1e9bac54da2f73087b1a58046504c507c94e58478f03f3b37336af254947964dbf9383575dc2cb3019640c7286ab0dfa5d5d9f55df96b34864
27 DIST zfs-8.0.4_5.12_compat_idmapped_mounts.patch 41410 BLAKE2B 49724351c5a8e6ffa66762d5aac84ad89a3d04022d086d9f37ccd616b3e8e95852197b5333bdeeeab54fc51516d8254d0138a4422cc66214bb602e5ed72bbabf SHA512 1554d74a7024c106a3f4814895a64914f2e3d627f7edff3c8f415b419c6a596454862f8c0984a6e2f96e340851f1a9222a4c472ebd6d5db7dc0aa108dc2dca6c
28
29 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc6.ebuild
30 deleted file mode 100644
31 index 34cc83a6093..00000000000
32 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc6.ebuild
33 +++ /dev/null
34 @@ -1,204 +0,0 @@
35 -# Copyright 1999-2021 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
41 -
42 -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
43 -HOMEPAGE="https://github.com/openzfs/zfs"
44 -
45 -if [[ ${PV} == "9999" ]]; then
46 - inherit git-r3
47 - EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
48 -else
49 - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
50 - inherit verify-sig
51 -
52 - MY_PV="${PV/_rc/-rc}"
53 - SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
54 - SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
55 - S="${WORKDIR}/zfs-${PV%_rc?}"
56 - ZFS_KERNEL_COMPAT="5.12"
57 -
58 - if [[ ${PV} != *_rc* ]]; then
59 - KEYWORDS="~amd64 ~arm64 ~ppc64"
60 - fi
61 -fi
62 -
63 -LICENSE="CDDL MIT debug? ( GPL-2+ )"
64 -SLOT="0/${PVR}"
65 -IUSE="custom-cflags debug +rootfs"
66 -
67 -RDEPEND="${DEPEND}
68 - !sys-kernel/spl
69 -"
70 -
71 -BDEPEND="
72 - dev-lang/perl
73 - virtual/awk
74 -"
75 -
76 -if [[ ${PV} != "9999" ]] ; then
77 - BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
78 -fi
79 -
80 -# PDEPEND in this form is needed to trick portage suggest
81 -# enabling dist-kernel if only 1 package have it set
82 -PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
83 -
84 -RESTRICT="debug? ( strip ) test"
85 -
86 -DOCS=( AUTHORS COPYRIGHT META README.md )
87 -
88 -pkg_pretend() {
89 - use rootfs || return 0
90 -
91 - if has_version virtual/dist-kernel && ! use dist-kernel; then
92 - ewarn "You have virtual/dist-kernel installed, but"
93 - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
94 - ewarn "It's recommended to globally enable dist-kernel USE flag"
95 - ewarn "to auto-trigger initrd rebuilds with kernel updates"
96 - fi
97 -}
98 -
99 -pkg_setup() {
100 - CONFIG_CHECK="
101 - !DEBUG_LOCK_ALLOC
102 - EFI_PARTITION
103 - MODULES
104 - !PAX_KERNEXEC_PLUGIN_METHOD_OR
105 - !TRIM_UNUSED_KSYMS
106 - ZLIB_DEFLATE
107 - ZLIB_INFLATE
108 - "
109 -
110 - use debug && CONFIG_CHECK="${CONFIG_CHECK}
111 - FRAME_POINTER
112 - DEBUG_INFO
113 - !DEBUG_INFO_REDUCED
114 - "
115 -
116 - use rootfs && \
117 - CONFIG_CHECK="${CONFIG_CHECK}
118 - BLK_DEV_INITRD
119 - DEVTMPFS
120 - "
121 -
122 - kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
123 -
124 - if [[ ${PV} != "9999" ]]; then
125 - local kv_major_max kv_minor_max zcompat
126 - zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
127 - kv_major_max="${zcompat%%.*}"
128 - zcompat="${zcompat#*.}"
129 - kv_minor_max="${zcompat%%.*}"
130 - kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
131 - "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
132 -
133 - fi
134 -
135 - kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
136 -
137 - linux-mod_pkg_setup
138 -}
139 -
140 -src_prepare() {
141 - default
142 -
143 - if [[ ${PV} == "9999" ]]; then
144 - eautoreconf
145 - else
146 - # Set module revision number
147 - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
148 - fi
149 -}
150 -
151 -src_configure() {
152 - set_arch_to_kernel
153 -
154 - use custom-cflags || strip-flags
155 -
156 - filter-ldflags -Wl,*
157 -
158 - local myconf=(
159 - CROSS_COMPILE="${CHOST}-"
160 - HOSTCC="$(tc-getBUILD_CC)"
161 - --bindir="${EPREFIX}/bin"
162 - --sbindir="${EPREFIX}/sbin"
163 - --with-config=kernel
164 - --with-linux="${KV_DIR}"
165 - --with-linux-obj="${KV_OUT_DIR}"
166 - $(use_enable debug)
167 - )
168 -
169 - econf "${myconf[@]}"
170 -}
171 -
172 -src_compile() {
173 - set_arch_to_kernel
174 -
175 - myemakeargs=(
176 - CROSS_COMPILE="${CHOST}-"
177 - HOSTCC="$(tc-getBUILD_CC)"
178 - V=1
179 - )
180 -
181 - emake "${myemakeargs[@]}"
182 -}
183 -
184 -src_install() {
185 - set_arch_to_kernel
186 -
187 - myemakeargs+=(
188 - DEPMOD=:
189 - DESTDIR="${D}"
190 - INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD
191 - )
192 -
193 - emake "${myemakeargs[@]}" install
194 -
195 - einstalldocs
196 -}
197 -
198 -pkg_postinst() {
199 - linux-mod_pkg_postinst
200 -
201 - # Remove old modules
202 - if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
203 - ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
204 - ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
205 - ewarn "Automatically removing old modules to avoid problems."
206 - rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
207 - rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
208 - fi
209 -
210 - if [[ -z ${ROOT} ]] && use dist-kernel; then
211 - set_arch_to_portage
212 - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
213 - fi
214 -
215 - if use x86 || use arm; then
216 - ewarn "32-bit kernels will likely require increasing vmalloc to"
217 - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
218 - fi
219 -
220 - ewarn "This version of OpenZFS includes support for new feature flags"
221 - ewarn "that are incompatible with previous versions. GRUB2 support for"
222 - ewarn "/boot with the new feature flags is not yet available."
223 - ewarn "Do *NOT* upgrade root pools to use the new feature flags."
224 - ewarn "Any new pools will be created with the new feature flags by default"
225 - ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
226 - ewarn "create a newpool that is backward compatible wih GRUB2, use "
227 - ewarn
228 - ewarn "zpool create -d -o feature@async_destroy=enabled "
229 - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
230 - ewarn " -o feature@spacemap_histogram=enabled"
231 - ewarn " -o feature@enabled_txg=enabled "
232 - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
233 - ewarn " ..."
234 - ewarn
235 - ewarn "GRUB2 support will be updated as soon as either the GRUB2"
236 - ewarn "developers do a tag or the Gentoo developers find time to backport"
237 - ewarn "support from GRUB2 HEAD."
238 -}