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: Wed, 29 Sep 2021 23:12:00
Message-Id: 1632956912.d58333f04fec1500d13af9fee27d202129dde808.gyakovlev@gentoo
1 commit: d58333f04fec1500d13af9fee27d202129dde808
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 29 23:06:39 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 29 23:08:32 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d58333f0
7
8 sys-fs/zfs-kmod: drop 2.0.5
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 sys-fs/zfs-kmod/Manifest | 2 -
13 sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild | 208 ----------------------------------
14 2 files changed, 210 deletions(-)
15
16 diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
17 index 0cad7488b20..6951557c4a7 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.5.tar.gz 13166149 BLAKE2B 4505c43a3b9a6c2b925383d00bbd9f17505290ded83f9bd3f08211769fa39254742340bdda65efd53f87f1708138517f91f8a43c01f3ce4191de200c84c77754 SHA512 ee1b3f0347442ee649a7ee8a2bb08208e011eea994076d30dd08dcd51dab29df0ff369b0c6e709346fa7de69cb07e0ffdceb34f01edb93d414578d1ffc6051ba
23 -DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa99bb6e43f0145bb30a0446a1ba5695b8207b085435da289fa0058643201ef2f8827e12b0803ab20b0df305 SHA512 91e73a8da45e4f49113fc1af684143902a23c9cf5e59f8cd2f3a1214aeff57af63a7fa05dbe3fa0465f002521b89a43d6086d765d03209d83a41761d56b358aa
24 DIST zfs-2.0.6.tar.gz 13192941 BLAKE2B 3a83303b016ec4259c286af8a9ceb281829d26508d411df91dd94193bca8c3155ef0ba63604e95f6add5f0c6cf6d100b0f567efc33b6c484c9ff811924da6ccd SHA512 52a5576eed21868b2a3d63d05d3d8c35b5e59ee88c7ddab1dc070644539f9acd56bde43ba5e965ad951a6d50a014fb429a7977d2ab1a2bfcadd92ea78dd57bf8
25 DIST zfs-2.0.6.tar.gz.asc 836 BLAKE2B 065eba3361ef4234acc67df0236ab9a6737ba9fe5a706be98b55dd64d10360160ca787d8873f27451a2107225ae657dc4cab20a7c2a268cd2de64c8d82d0327a SHA512 123569ecfcee22ac462160acf61b120144c774bc5c0d46a50d2b7312f7565da1a9d780e1a6207dba5834917c66d5b852763e4a3162378d5c9bb90b0dfde35c5c
26 DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f
27
28 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
29 deleted file mode 100644
30 index 74e838c5764..00000000000
31 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
32 +++ /dev/null
33 @@ -1,208 +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=${BROOT}/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.13"
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/${PVR}"
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 -# PDEPEND in this form is needed to trick portage suggest
80 -# enabling dist-kernel if only 1 package have it set
81 -PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
82 -
83 -RESTRICT="debug? ( strip ) test"
84 -
85 -DOCS=( AUTHORS COPYRIGHT META README.md )
86 -
87 -pkg_pretend() {
88 - use rootfs || return 0
89 -
90 - if has_version virtual/dist-kernel && ! use dist-kernel; then
91 - ewarn "You have virtual/dist-kernel installed, but"
92 - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
93 - ewarn "It's recommended to globally enable dist-kernel USE flag"
94 - ewarn "to auto-trigger initrd rebuilds with kernel updates"
95 - fi
96 -}
97 -
98 -pkg_setup() {
99 - CONFIG_CHECK="
100 - !DEBUG_LOCK_ALLOC
101 - EFI_PARTITION
102 - MODULES
103 - !PAX_KERNEXEC_PLUGIN_METHOD_OR
104 - !TRIM_UNUSED_KSYMS
105 - ZLIB_DEFLATE
106 - ZLIB_INFLATE
107 - "
108 -
109 - use debug && CONFIG_CHECK="${CONFIG_CHECK}
110 - FRAME_POINTER
111 - DEBUG_INFO
112 - !DEBUG_INFO_REDUCED
113 - "
114 -
115 - use rootfs && \
116 - CONFIG_CHECK="${CONFIG_CHECK}
117 - BLK_DEV_INITRD
118 - DEVTMPFS
119 - "
120 -
121 - kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
122 -
123 - if [[ ${PV} != "9999" ]]; then
124 - local kv_major_max kv_minor_max zcompat
125 - zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
126 - kv_major_max="${zcompat%%.*}"
127 - zcompat="${zcompat#*.}"
128 - kv_minor_max="${zcompat%%.*}"
129 - kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
130 - "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
131 -
132 - fi
133 -
134 - kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
135 -
136 - linux-mod_pkg_setup
137 -}
138 -
139 -src_prepare() {
140 - default
141 -
142 - # Run unconditionally (bug #792627)
143 - eautoreconf
144 -
145 - if [[ ${PV} != "9999" ]]; then
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 - # Set CROSS_COMPILE in the environment.
159 - # This allows the user to override it via make.conf or via a local Makefile.
160 - # https://bugs.gentoo.org/811600
161 - export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
162 -
163 - local myconf=(
164 - HOSTCC="$(tc-getBUILD_CC)"
165 - --bindir="${EPREFIX}/bin"
166 - --sbindir="${EPREFIX}/sbin"
167 - --with-config=kernel
168 - --with-linux="${KV_DIR}"
169 - --with-linux-obj="${KV_OUT_DIR}"
170 - $(use_enable debug)
171 - )
172 -
173 - econf "${myconf[@]}"
174 -}
175 -
176 -src_compile() {
177 - set_arch_to_kernel
178 -
179 - myemakeargs=(
180 - HOSTCC="$(tc-getBUILD_CC)"
181 - V=1
182 - )
183 -
184 - emake "${myemakeargs[@]}"
185 -}
186 -
187 -src_install() {
188 - set_arch_to_kernel
189 -
190 - myemakeargs+=(
191 - DEPMOD=:
192 - DESTDIR="${D}"
193 - INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD
194 - )
195 -
196 - emake "${myemakeargs[@]}" install
197 -
198 - einstalldocs
199 -}
200 -
201 -pkg_postinst() {
202 - linux-mod_pkg_postinst
203 -
204 - # Remove old modules
205 - if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
206 - ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
207 - ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
208 - ewarn "Automatically removing old modules to avoid problems."
209 - rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
210 - rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
211 - fi
212 -
213 - if [[ -z ${ROOT} ]] && use dist-kernel; then
214 - set_arch_to_portage
215 - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
216 - fi
217 -
218 - if use x86 || use arm; then
219 - ewarn "32-bit kernels will likely require increasing vmalloc to"
220 - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
221 - fi
222 -
223 - ewarn "This version of OpenZFS includes support for new feature flags"
224 - ewarn "that are incompatible with previous versions. GRUB2 support for"
225 - ewarn "/boot with the new feature flags is not yet available."
226 - ewarn "Do *NOT* upgrade root pools to use the new feature flags."
227 - ewarn "Any new pools will be created with the new feature flags by default"
228 - ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
229 - ewarn "create a newpool that is backward compatible wih GRUB2, use "
230 - ewarn
231 - ewarn "zpool create -d -o feature@async_destroy=enabled "
232 - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
233 - ewarn " -o feature@spacemap_histogram=enabled"
234 - ewarn " -o feature@enabled_txg=enabled "
235 - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
236 - ewarn " ..."
237 - ewarn
238 - ewarn "GRUB2 support will be updated as soon as either the GRUB2"
239 - ewarn "developers do a tag or the Gentoo developers find time to backport"
240 - ewarn "support from GRUB2 HEAD."
241 -}