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:03
Message-Id: 1632956915.d5753ada14bb36dbc6435bb6e964aa87e895f1e2.gyakovlev@gentoo
1 commit: d5753ada14bb36dbc6435bb6e964aa87e895f1e2
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 29 23:07:26 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 29 23:08:35 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5753ada
7
8 sys-fs/zfs-kmod: drop 2.1.0
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.1.0.ebuild | 194 ----------------------------------
14 2 files changed, 196 deletions(-)
15
16 diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
17 index 6951557c4a7..2901db693d5 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.6.tar.gz 13192941 BLAKE2B 3a83303b016ec4259c286af8a9ceb281829d26508d411df91dd94193bca8c3155ef0ba63604e95f6add5f0c6cf6d100b0f567efc33b6c484c9ff811924da6ccd SHA512 52a5576eed21868b2a3d63d05d3d8c35b5e59ee88c7ddab1dc070644539f9acd56bde43ba5e965ad951a6d50a014fb429a7977d2ab1a2bfcadd92ea78dd57bf8
23 DIST zfs-2.0.6.tar.gz.asc 836 BLAKE2B 065eba3361ef4234acc67df0236ab9a6737ba9fe5a706be98b55dd64d10360160ca787d8873f27451a2107225ae657dc4cab20a7c2a268cd2de64c8d82d0327a SHA512 123569ecfcee22ac462160acf61b120144c774bc5c0d46a50d2b7312f7565da1a9d780e1a6207dba5834917c66d5b852763e4a3162378d5c9bb90b0dfde35c5c
24 -DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f
25 -DIST zfs-2.1.0.tar.gz.asc 195 BLAKE2B d5a7c01c7fd1798a235d5bc9ba89353a85978ac8bb1eaec1c587b8cc6d7cd24b0d7613c465a8da7ba29a172e4ebd6e465f893145d9dd7adf11d7e3858fea835a SHA512 1c5c8d20adbcc27c5e5d760a84e258a897dee7c3950ef1eb56f3ef6bd1c85516c7776ce30b3e63229cd65315d43e06b5e04c587e9483b96b00adb42d24749c1a
26 DIST zfs-2.1.1.tar.gz 34836374 BLAKE2B 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 SHA512 b69ce764a9f7438ec2c90f86be02abfd684c67cd38de876374e3e6f4b2f82a75d86fa70205def2ba454ad27e52ec8d955ebc4ba456e91d397129a54ea849c19c
27 DIST zfs-2.1.1.tar.gz.asc 195 BLAKE2B d886e7dc74270228f98dfc5ca85bbbe897d5a87a5ae8bbfde28e2af1b36218227bc9f1b5902e97beebe160a298857d6e4673829d87cd8039332dc1858cfcffc0 SHA512 d76956b5c1bd547a319e70dd33d50beae39f65fca54532731426d2ef209385a556c51b3936051f75bc3800623c42da5b8d279c51f501a896f5fdfb7b4ed7fb94
28
29 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
30 deleted file mode 100644
31 index 3aa1db85dc3..00000000000
32 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
33 +++ /dev/null
34 @@ -1,194 +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=${BROOT}/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.13"
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 - # Run unconditionally (bug #792627)
144 - eautoreconf
145 -
146 - if [[ ${PV} != "9999" ]]; then
147 - # Set module revision number
148 - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
149 - fi
150 -}
151 -
152 -src_configure() {
153 - set_arch_to_kernel
154 -
155 - use custom-cflags || strip-flags
156 -
157 - filter-ldflags -Wl,*
158 -
159 - # Set CROSS_COMPILE in the environment.
160 - # This allows the user to override it via make.conf or via a local Makefile.
161 - # https://bugs.gentoo.org/811600
162 - export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
163 -
164 - local myconf=(
165 - HOSTCC="$(tc-getBUILD_CC)"
166 - --bindir="${EPREFIX}/bin"
167 - --sbindir="${EPREFIX}/sbin"
168 - --with-config=kernel
169 - --with-linux="${KV_DIR}"
170 - --with-linux-obj="${KV_OUT_DIR}"
171 - $(use_enable debug)
172 - )
173 -
174 - econf "${myconf[@]}"
175 -}
176 -
177 -src_compile() {
178 - set_arch_to_kernel
179 -
180 - myemakeargs=(
181 - HOSTCC="$(tc-getBUILD_CC)"
182 - V=1
183 - )
184 -
185 - emake "${myemakeargs[@]}"
186 -}
187 -
188 -src_install() {
189 - set_arch_to_kernel
190 -
191 - myemakeargs+=(
192 - DEPMOD=:
193 - DESTDIR="${D}"
194 - INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD
195 - )
196 -
197 - emake "${myemakeargs[@]}" install
198 -
199 - einstalldocs
200 -}
201 -
202 -pkg_postinst() {
203 - linux-mod_pkg_postinst
204 -
205 - if [[ -z ${ROOT} ]] && use dist-kernel; then
206 - set_arch_to_portage
207 - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
208 - fi
209 -
210 - if use x86 || use arm; then
211 - ewarn "32-bit kernels will likely require increasing vmalloc to"
212 - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
213 - fi
214 -
215 - if has_version sys-boot/grub; then
216 - ewarn "This version of OpenZFS includes support for new feature flags"
217 - ewarn "that are incompatible with previous versions. GRUB2 support for"
218 - ewarn "/boot with the new feature flags is not yet available."
219 - ewarn "Do *NOT* upgrade root pools to use the new feature flags."
220 - ewarn "Any new pools will be created with the new feature flags by default"
221 - ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
222 - ewarn "create a newpool that is backward compatible wih GRUB2, use "
223 - ewarn
224 - ewarn "zpool create -o compatibility=grub2 ..."
225 - ewarn
226 - ewarn "Refer to /etc/zfs/compatibility.d/grub2 for list of features."
227 - fi
228 -}