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/
Date: Fri, 11 Jun 2021 02:07:38
Message-Id: 1623376157.60216bac8619850125d10dee9d3bb357ceadae00.sam@gentoo
1 commit: 60216bac8619850125d10dee9d3bb357ceadae00
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 11 01:49:17 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 11 01:49:17 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60216bac
7
8 sys-fs/zfs: drop 2.1.0_rc6
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-fs/zfs/Manifest | 2 -
13 sys-fs/zfs/zfs-2.1.0_rc6.ebuild | 288 ----------------------------------------
14 2 files changed, 290 deletions(-)
15
16 diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
17 index 5c21005764e..e5b9f6565c8 100644
18 --- a/sys-fs/zfs/Manifest
19 +++ b/sys-fs/zfs/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-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
28 diff --git a/sys-fs/zfs/zfs-2.1.0_rc6.ebuild b/sys-fs/zfs/zfs-2.1.0_rc6.ebuild
29 deleted file mode 100644
30 index 1cd4e63b4e6..00000000000
31 --- a/sys-fs/zfs/zfs-2.1.0_rc6.ebuild
32 +++ /dev/null
33 @@ -1,288 +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 -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/5"
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 -pkg_pretend() {
129 - use rootfs || return 0
130 -
131 - if has_version virtual/dist-kernel && ! use dist-kernel; then
132 - ewarn "You have virtual/dist-kernel installed, but"
133 - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
134 - ewarn "It's recommended to globally enable dist-kernel USE flag"
135 - ewarn "to auto-trigger initrd rebuilds with kernel updates"
136 - fi
137 -}
138 -
139 -pkg_setup() {
140 - if use kernel_linux; then
141 - linux-info_pkg_setup
142 -
143 - if ! linux_config_exists; then
144 - ewarn "Cannot check the linux kernel configuration."
145 - else
146 - if use test-suite; then
147 - if linux_chkconfig_present BLK_DEV_LOOP; then
148 - eerror "The ZFS test suite requires loop device support enabled."
149 - eerror "Please enable it:"
150 - eerror " CONFIG_BLK_DEV_LOOP=y"
151 - eerror "in /usr/src/linux/.config or"
152 - eerror " Device Drivers --->"
153 - eerror " Block devices --->"
154 - eerror " [X] Loopback device support"
155 - fi
156 - fi
157 - fi
158 - fi
159 -}
160 -
161 -libsoversion_check() {
162 -
163 - local bugurl libzfs_sover
164 - bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
165 -
166 - libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
167 - | grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
168 - libzfs_sover="${libzfs_sover%%:*}"
169 -
170 - if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
171 - echo
172 - eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
173 - eerror "ebuild subslot does not match libzfs soversion!"
174 - eerror "libzfs soversion: ${libzfs_sover}"
175 - eerror "ebuild value: $(ver_cut 2 ${SLOT})"
176 - eerror "This is a bug in the ebuild, please use the following URL to report it"
177 - eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
178 - echo
179 - # we want to abort for releases, but just print a warning for live ebuild
180 - # to keep package installable
181 - [[ ${PV} == "9999" ]] || die
182 - fi
183 -}
184 -
185 -src_prepare() {
186 - default
187 - libsoversion_check
188 -
189 - if [[ ${PV} == "9999" ]]; then
190 - eautoreconf
191 - else
192 - # Set revision number
193 - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
194 - fi
195 -
196 - if use python; then
197 - pushd contrib/pyzfs >/dev/null || die
198 - distutils-r1_src_prepare
199 - popd >/dev/null || die
200 - fi
201 -
202 - # prevent errors showing up on zfs-mount stop, #647688
203 - # openrc will unmount all filesystems anyway.
204 - sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
205 -}
206 -
207 -src_configure() {
208 - use custom-cflags || strip-flags
209 - use minimal || python_setup
210 -
211 - local myconf=(
212 - --bindir="${EPREFIX}/bin"
213 - --enable-shared
214 - --enable-systemd
215 - --enable-sysvinit
216 - --localstatedir="${EPREFIX}/var"
217 - --sbindir="${EPREFIX}/sbin"
218 - --with-config=user
219 - --with-dracutdir="${EPREFIX}/usr/lib/dracut"
220 - --with-linux="${KV_DIR}"
221 - --with-linux-obj="${KV_OUT_DIR}"
222 - --with-udevdir="$(get_udevdir)"
223 - --with-pamconfigsdir="${EPREFIX}/unwanted_files"
224 - --with-pammoduledir="$(getpam_mod_dir)"
225 - --with-systemdunitdir="$(systemd_get_systemunitdir)"
226 - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
227 - --with-vendor=gentoo
228 - $(use_enable debug)
229 - $(use_enable nls)
230 - $(use_enable pam)
231 - $(use_enable python pyzfs)
232 - $(use_enable static-libs static)
233 - $(usex minimal --without-python --with-python="${EPYTHON}")
234 - )
235 -
236 - econf "${myconf[@]}"
237 -}
238 -
239 -src_compile() {
240 - default
241 - if use python; then
242 - pushd contrib/pyzfs >/dev/null || die
243 - distutils-r1_src_compile
244 - popd >/dev/null || die
245 - fi
246 -}
247 -
248 -src_install() {
249 - default
250 -
251 - gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
252 -
253 - use pam && { rm -rv "${ED}/unwanted_files" || die ; }
254 -
255 - use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
256 -
257 - if ! use static-libs; then
258 - find "${ED}" -name '*.la' -delete || die
259 - fi
260 -
261 - dobashcomp contrib/bash_completion.d/zfs
262 - bashcomp_alias zfs zpool
263 -
264 - # strip executable bit from conf.d file
265 - fperms 0644 /etc/conf.d/zfs
266 -
267 - if use python; then
268 - pushd contrib/pyzfs >/dev/null || die
269 - distutils-r1_src_install
270 - popd >/dev/null || die
271 - fi
272 -
273 - # enforce best available python implementation
274 - use minimal || python_fix_shebang "${ED}/bin"
275 -}
276 -
277 -pkg_postinst() {
278 - # we always need userspace utils in sync with zfs-kmod
279 - # so force initrd update for userspace as well, to avoid
280 - # situation when zfs-kmod trigger initrd rebuild before
281 - # userspace component is rebuilt
282 - # KV_* variables are provided by linux-info.eclass
283 - if [[ -z ${ROOT} ]] && use dist-kernel; then
284 - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
285 - fi
286 -
287 - if use rootfs; then
288 - if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
289 - elog "Root on zfs requires an initramfs to boot"
290 - elog "The following packages provide one and are tested on a regular basis:"
291 - elog " sys-kernel/dracut"
292 - elog " sys-kernel/genkernel"
293 - fi
294 - fi
295 -
296 - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
297 - einfo "Adding ${P} to the module database to ensure that the"
298 - einfo "kernel modules and userland utilities stay in sync."
299 - update_moduledb
300 - fi
301 -
302 - if systemd_is_booted || has_version sys-apps/systemd; then
303 - einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
304 - einfo "for default zfs systemd service configuration"
305 - else
306 - [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
307 - einfo "You should add zfs-import to the boot runlevel."
308 - [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
309 - einfo "You should add zfs-mount to the boot runlevel."
310 - [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
311 - einfo "You should add zfs-share to the default runlevel."
312 - [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
313 - einfo "You should add zfs-zed to the default runlevel."
314 - fi
315 -}
316 -
317 -pkg_postrm() {
318 - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
319 - remove_moduledb
320 - fi
321 -}