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/
Date: Thu, 24 Jun 2021 02:28:06
Message-Id: 1624501623.69661b79cf6b981bd54b4b1ef3186fc5a41638b6.gyakovlev@gentoo
1 commit: 69661b79cf6b981bd54b4b1ef3186fc5a41638b6
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 23 23:43:03 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 24 02:27:03 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69661b79
7
8 sys-fs/zfs: add 2.0.5
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 sys-fs/zfs/Manifest | 2 +
13 sys-fs/zfs/zfs-2.0.5.ebuild | 294 ++++++++++++++++++++++++++++++++++++++++++++
14 2 files changed, 296 insertions(+)
15
16 diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
17 index e5b9f6565c8..2298d1f69d1 100644
18 --- a/sys-fs/zfs/Manifest
19 +++ b/sys-fs/zfs/Manifest
20 @@ -1,4 +1,6 @@
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.0.5.tar.gz 13166149 BLAKE2B 4505c43a3b9a6c2b925383d00bbd9f17505290ded83f9bd3f08211769fa39254742340bdda65efd53f87f1708138517f91f8a43c01f3ce4191de200c84c77754 SHA512 ee1b3f0347442ee649a7ee8a2bb08208e011eea994076d30dd08dcd51dab29df0ff369b0c6e709346fa7de69cb07e0ffdceb34f01edb93d414578d1ffc6051ba
24 +DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa99bb6e43f0145bb30a0446a1ba5695b8207b085435da289fa0058643201ef2f8827e12b0803ab20b0df305 SHA512 91e73a8da45e4f49113fc1af684143902a23c9cf5e59f8cd2f3a1214aeff57af63a7fa05dbe3fa0465f002521b89a43d6086d765d03209d83a41761d56b358aa
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
28 diff --git a/sys-fs/zfs/zfs-2.0.5.ebuild b/sys-fs/zfs/zfs-2.0.5.ebuild
29 new file mode 100644
30 index 00000000000..641afbb2f31
31 --- /dev/null
32 +++ b/sys-fs/zfs/zfs-2.0.5.ebuild
33 @@ -0,0 +1,294 @@
34 +# Copyright 1999-2021 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=7
38 +
39 +DISTUTILS_OPTIONAL=1
40 +DISTUTILS_USE_SETUPTOOLS=manual
41 +PYTHON_COMPAT=( python3_{7,8,9} )
42 +
43 +inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
44 +
45 +DESCRIPTION="Userland utilities for ZFS Linux kernel module"
46 +HOMEPAGE="https://github.com/openzfs/zfs"
47 +
48 +if [[ ${PV} == "9999" ]]; then
49 + inherit git-r3 linux-mod
50 + EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
51 +else
52 + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
53 + inherit verify-sig
54 +
55 + MY_P="${P/_rc/-rc}"
56 + SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
57 + SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
58 + S="${WORKDIR}/${P%_rc?}"
59 +
60 + if [[ ${PV} != *_rc* ]]; then
61 + KEYWORDS="~amd64 ~arm64 ~ppc64"
62 + fi
63 +fi
64 +
65 +LICENSE="BSD-2 CDDL MIT"
66 +# just libzfs soname major for now.
67 +# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
68 +# see libsoversion_check() below as well
69 +SLOT="0/4"
70 +IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite static-libs"
71 +
72 +DEPEND="
73 + net-libs/libtirpc[static-libs?]
74 + sys-apps/util-linux[static-libs?]
75 + sys-libs/zlib[static-libs(+)?]
76 + virtual/libudev[static-libs(-)?]
77 + dev-libs/openssl:0=[static-libs?]
78 + !minimal? ( ${PYTHON_DEPS} )
79 + pam? ( sys-libs/pam )
80 + python? (
81 + virtual/python-cffi[${PYTHON_USEDEP}]
82 + )
83 +"
84 +
85 +BDEPEND="virtual/awk
86 + virtual/pkgconfig
87 + nls? ( sys-devel/gettext )
88 + python? (
89 + dev-python/setuptools[${PYTHON_USEDEP}]
90 + )
91 +"
92 +
93 +if [[ ${PV} != "9999" ]] ; then
94 + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
95 +fi
96 +
97 +# awk is used for some scripts, completions, and the Dracut module
98 +RDEPEND="${DEPEND}
99 + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
100 + !prefix? ( virtual/udev )
101 + sys-fs/udev-init-scripts
102 + virtual/awk
103 + dist-kernel? ( virtual/dist-kernel:= )
104 + rootfs? (
105 + app-arch/cpio
106 + app-misc/pax-utils
107 + !<sys-kernel/genkernel-3.5.1.1
108 + )
109 + test-suite? (
110 + sys-apps/kmod[tools]
111 + sys-apps/util-linux
112 + sys-devel/bc
113 + sys-block/parted
114 + sys-fs/lsscsi
115 + sys-fs/mdadm
116 + sys-process/procps
117 + )
118 +"
119 +
120 +REQUIRED_USE="
121 + !minimal? ( ${PYTHON_REQUIRED_USE} )
122 + python? ( !minimal )
123 + test-suite? ( !minimal )
124 +"
125 +
126 +RESTRICT="test"
127 +
128 +PATCHES=(
129 + "${FILESDIR}/bash-completion-sudo.patch"
130 + "${FILESDIR}/2.0.4-scrub-timers.patch"
131 +)
132 +
133 +pkg_pretend() {
134 + use rootfs || return 0
135 +
136 + if has_version virtual/dist-kernel && ! use dist-kernel; then
137 + ewarn "You have virtual/dist-kernel installed, but"
138 + ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
139 + ewarn "It's recommended to globally enable dist-kernel USE flag"
140 + ewarn "to auto-trigger initrd rebuilds with kernel updates"
141 + fi
142 +}
143 +
144 +pkg_setup() {
145 + if use kernel_linux; then
146 + linux-info_pkg_setup
147 +
148 + if ! linux_config_exists; then
149 + ewarn "Cannot check the linux kernel configuration."
150 + else
151 + if use test-suite; then
152 + if linux_chkconfig_present BLK_DEV_LOOP; then
153 + eerror "The ZFS test suite requires loop device support enabled."
154 + eerror "Please enable it:"
155 + eerror " CONFIG_BLK_DEV_LOOP=y"
156 + eerror "in /usr/src/linux/.config or"
157 + eerror " Device Drivers --->"
158 + eerror " Block devices --->"
159 + eerror " [X] Loopback device support"
160 + fi
161 + fi
162 + fi
163 + fi
164 +}
165 +
166 +libsoversion_check() {
167 +
168 + local bugurl libzfs_sover
169 + bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
170 +
171 + libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
172 + | grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
173 + libzfs_sover="${libzfs_sover%%:*}"
174 +
175 + if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
176 + echo
177 + eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
178 + eerror "ebuild subslot does not match libzfs soversion!"
179 + eerror "libzfs soversion: ${libzfs_sover}"
180 + eerror "ebuild value: $(ver_cut 2 ${SLOT})"
181 + eerror "This is a bug in the ebuild, please use the following URL to report it"
182 + eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
183 + echo
184 + # we want to abort for releases, but just print a warning for live ebuild
185 + # to keep package installable
186 + [[ ${PV} == "9999" ]] || die
187 + fi
188 +}
189 +
190 +src_prepare() {
191 + default
192 + libsoversion_check
193 +
194 + # Run unconditionally (bug #792627)
195 + eautoreconf
196 +
197 + if [[ ${PV} != "9999" ]]; then
198 + # Set revision number
199 + sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
200 + fi
201 +
202 + if use python; then
203 + pushd contrib/pyzfs >/dev/null || die
204 + distutils-r1_src_prepare
205 + popd >/dev/null || die
206 + fi
207 +
208 + # prevent errors showing up on zfs-mount stop, #647688
209 + # openrc will unmount all filesystems anyway.
210 + sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
211 +}
212 +
213 +src_configure() {
214 + use custom-cflags || strip-flags
215 + use minimal || python_setup
216 +
217 + local myconf=(
218 + --bindir="${EPREFIX}/bin"
219 + --enable-shared
220 + --enable-systemd
221 + --enable-sysvinit
222 + --localstatedir="${EPREFIX}/var"
223 + --sbindir="${EPREFIX}/sbin"
224 + --with-config=user
225 + --with-dracutdir="${EPREFIX}/usr/lib/dracut"
226 + --with-linux="${KV_DIR}"
227 + --with-linux-obj="${KV_OUT_DIR}"
228 + --with-udevdir="$(get_udevdir)"
229 + --with-pamconfigsdir="${EPREFIX}/unwanted_files"
230 + --with-pammoduledir="$(getpam_mod_dir)"
231 + --with-systemdunitdir="$(systemd_get_systemunitdir)"
232 + --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
233 + --with-vendor=gentoo
234 + $(use_enable debug)
235 + $(use_enable nls)
236 + $(use_enable pam)
237 + $(use_enable python pyzfs)
238 + $(use_enable static-libs static)
239 + $(usex minimal --without-python --with-python="${EPYTHON}")
240 + )
241 +
242 + econf "${myconf[@]}"
243 +}
244 +
245 +src_compile() {
246 + default
247 + if use python; then
248 + pushd contrib/pyzfs >/dev/null || die
249 + distutils-r1_src_compile
250 + popd >/dev/null || die
251 + fi
252 +}
253 +
254 +src_install() {
255 + default
256 +
257 + gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
258 +
259 + use pam && { rm -rv "${ED}/unwanted_files" || die ; }
260 +
261 + use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
262 +
263 + if ! use static-libs; then
264 + find "${ED}" -name '*.la' -delete || die
265 + fi
266 +
267 + dobashcomp contrib/bash_completion.d/zfs
268 + bashcomp_alias zfs zpool
269 +
270 + # strip executable bit from conf.d file
271 + fperms 0644 /etc/conf.d/zfs
272 +
273 + if use python; then
274 + pushd contrib/pyzfs >/dev/null || die
275 + distutils-r1_src_install
276 + popd >/dev/null || die
277 + fi
278 +
279 + # enforce best available python implementation
280 + use minimal || python_fix_shebang "${ED}/bin"
281 +}
282 +
283 +pkg_postinst() {
284 + # we always need userspace utils in sync with zfs-kmod
285 + # so force initrd update for userspace as well, to avoid
286 + # situation when zfs-kmod trigger initrd rebuild before
287 + # userspace component is rebuilt
288 + # KV_* variables are provided by linux-info.eclass
289 + if [[ -z ${ROOT} ]] && use dist-kernel; then
290 + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
291 + fi
292 +
293 + if use rootfs; then
294 + if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
295 + elog "Root on zfs requires an initramfs to boot"
296 + elog "The following packages provide one and are tested on a regular basis:"
297 + elog " sys-kernel/dracut"
298 + elog " sys-kernel/genkernel"
299 + fi
300 + fi
301 +
302 + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
303 + einfo "Adding ${P} to the module database to ensure that the"
304 + einfo "kernel modules and userland utilities stay in sync."
305 + update_moduledb
306 + fi
307 +
308 + if systemd_is_booted || has_version sys-apps/systemd; then
309 + einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
310 + einfo "for default zfs systemd service configuration"
311 + else
312 + [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
313 + einfo "You should add zfs-import to the boot runlevel."
314 + [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
315 + einfo "You should add zfs-mount to the boot runlevel."
316 + [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
317 + einfo "You should add zfs-share to the default runlevel."
318 + [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
319 + einfo "You should add zfs-zed to the default runlevel."
320 + fi
321 +}
322 +
323 +pkg_postrm() {
324 + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
325 + remove_moduledb
326 + fi
327 +}