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