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: Sun, 02 May 2021 16:45:57
Message-Id: 1619973911.dc52fedcb856bcadb2e2cee803233951b582ed2d.gyakovlev@gentoo
1 commit: dc52fedcb856bcadb2e2cee803233951b582ed2d
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 2 16:41:25 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Sun May 2 16:45:11 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc52fedc
7
8 sys-fs/zfs: drop 2.0.3
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 sys-fs/zfs/Manifest | 1 -
14 sys-fs/zfs/zfs-2.0.3.ebuild | 231 --------------------------------------------
15 2 files changed, 232 deletions(-)
16
17 diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
18 index a87778f29df..de45009ef11 100644
19 --- a/sys-fs/zfs/Manifest
20 +++ b/sys-fs/zfs/Manifest
21 @@ -1,5 +1,4 @@
22 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
23 -DIST zfs-2.0.3.tar.gz 13114404 BLAKE2B 71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5 SHA512 8b2a6e0edfb3c85441076b2c6163ad3d7d239e11db128ab74d60bf8dc802d67b7f5b8d1cc7227316a7dc3917f14e9ac072ebf1583957f2a45c1b8438e4068200
24 DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b
25 DIST zfs-2.1.0-rc4.tar.gz 34806338 BLAKE2B b15b641ad322b7a50a5942500ef7c26f85074ef2672747f7391fcc785c3564c23fa5d49d51a146d284309905b4f1e1f96bb1e48f5cd1aeaebe6c55bc74a1f46f SHA512 1739798ea4fa552300004cbcb16ab0d3b02bba7cbd3bb31f9282af2dab9606478754abb49b8f170b0dfedfc4e2484e16cc8c160d02fa72a9b6720660c663e7bc
26 DIST zfs-2.1.0-rc4.tar.gz.asc 195 BLAKE2B 99fd0599ed81838a1c416dbfbaa1bace607576544d5a49918d98c1c8ddf879be694f8c3213c5f5d28f7806a99bc08027ab45d46d55eed3b0e3952ec51af204ae SHA512 ed331cc7db67590d62c19fb37babd0303fddf8255d93d0742659c98af26da31d45685770ec86b086e2ba4468d48bb2c3faba1763e4b00d0c5624a308ee751527
27
28 diff --git a/sys-fs/zfs/zfs-2.0.3.ebuild b/sys-fs/zfs/zfs-2.0.3.ebuild
29 deleted file mode 100644
30 index 1d1a3c6ccc7..00000000000
31 --- a/sys-fs/zfs/zfs-2.0.3.ebuild
32 +++ /dev/null
33 @@ -1,231 +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 -PYTHON_COMPAT=( python3_{7,8,9} )
41 -
42 -inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
43 -
44 -DESCRIPTION="Userland utilities for ZFS Linux kernel module"
45 -HOMEPAGE="https://github.com/openzfs/zfs"
46 -
47 -if [[ ${PV} == "9999" ]] ; then
48 - inherit git-r3 linux-mod
49 - EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
50 -else
51 - MY_P="${P/_rc/-rc}"
52 - SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
53 - KEYWORDS="~amd64 ~arm64 ~ppc64"
54 - S="${WORKDIR}/${P%_rc?}"
55 -fi
56 -
57 -LICENSE="BSD-2 CDDL MIT"
58 -# just libzfs soname major for now.
59 -# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
60 -SLOT="0/4"
61 -IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
62 -
63 -DEPEND="
64 - net-libs/libtirpc[static-libs?]
65 - sys-apps/util-linux[static-libs?]
66 - sys-libs/zlib[static-libs(+)?]
67 - virtual/awk
68 - virtual/libudev[static-libs(-)?]
69 - libressl? ( dev-libs/libressl:0=[static-libs?] )
70 - !libressl? ( dev-libs/openssl:0=[static-libs?] )
71 - !minimal? ( ${PYTHON_DEPS} )
72 - pam? ( sys-libs/pam )
73 - python? (
74 - virtual/python-cffi[${PYTHON_USEDEP}]
75 - )
76 -"
77 -
78 -BDEPEND="virtual/awk
79 - virtual/pkgconfig
80 - nls? ( sys-devel/gettext )
81 - python? (
82 - dev-python/setuptools[${PYTHON_USEDEP}]
83 - )
84 -"
85 -
86 -RDEPEND="${DEPEND}
87 - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
88 - !prefix? ( virtual/udev )
89 - sys-fs/udev-init-scripts
90 - rootfs? (
91 - app-arch/cpio
92 - app-misc/pax-utils
93 - !<sys-kernel/genkernel-3.5.1.1
94 - )
95 - test-suite? (
96 - sys-apps/kmod[tools]
97 - sys-apps/util-linux
98 - sys-devel/bc
99 - sys-block/parted
100 - sys-fs/lsscsi
101 - sys-fs/mdadm
102 - sys-process/procps
103 - )
104 -"
105 -
106 -REQUIRED_USE="
107 - !minimal? ( ${PYTHON_REQUIRED_USE} )
108 - python? ( !minimal )
109 - test-suite? ( !minimal )
110 -"
111 -
112 -RESTRICT="test"
113 -
114 -PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
115 -
116 -pkg_setup() {
117 - if use kernel_linux && use test-suite; then
118 - linux-info_pkg_setup
119 -
120 - if ! linux_config_exists; then
121 - ewarn "Cannot check the linux kernel configuration."
122 - else
123 - if use test-suite; then
124 - if linux_chkconfig_present BLK_DEV_LOOP; then
125 - eerror "The ZFS test suite requires loop device support enabled."
126 - eerror "Please enable it:"
127 - eerror " CONFIG_BLK_DEV_LOOP=y"
128 - eerror "in /usr/src/linux/.config or"
129 - eerror " Device Drivers --->"
130 - eerror " Block devices --->"
131 - eerror " [X] Loopback device support"
132 - fi
133 - fi
134 - fi
135 - fi
136 -}
137 -
138 -src_prepare() {
139 - default
140 -
141 - if [[ ${PV} == "9999" ]]; then
142 - eautoreconf
143 - else
144 - # Set revision number
145 - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
146 - fi
147 -
148 - if use python; then
149 - pushd contrib/pyzfs >/dev/null || die
150 - distutils-r1_src_prepare
151 - popd >/dev/null || die
152 - fi
153 -
154 - # prevent errors showing up on zfs-mount stop, #647688
155 - # openrc will unmount all filesystems anyway.
156 - sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
157 -}
158 -
159 -src_configure() {
160 - use custom-cflags || strip-flags
161 - use minimal || python_setup
162 -
163 - local myconf=(
164 - --bindir="${EPREFIX}/bin"
165 - --enable-shared
166 - --enable-systemd
167 - --enable-sysvinit
168 - --localstatedir="${EPREFIX}/var"
169 - --sbindir="${EPREFIX}/sbin"
170 - --with-config=user
171 - --with-dracutdir="${EPREFIX}/usr/lib/dracut"
172 - --with-linux="${KV_DIR}"
173 - --with-linux-obj="${KV_OUT_DIR}"
174 - --with-udevdir="$(get_udevdir)"
175 - --with-pamconfigsdir="${EPREFIX}/unwanted_files"
176 - --with-pammoduledir="$(getpam_mod_dir)"
177 - --with-systemdunitdir="$(systemd_get_systemunitdir)"
178 - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
179 - --with-vendor=gentoo
180 - $(use_enable debug)
181 - $(use_enable nls)
182 - $(use_enable pam)
183 - $(use_enable python pyzfs)
184 - $(use_enable static-libs static)
185 - $(usex minimal --without-python --with-python="${EPYTHON}")
186 - )
187 -
188 - econf "${myconf[@]}"
189 -}
190 -
191 -src_compile() {
192 - default
193 - if use python; then
194 - pushd contrib/pyzfs >/dev/null || die
195 - distutils-r1_src_compile
196 - popd >/dev/null || die
197 - fi
198 -}
199 -
200 -src_install() {
201 - default
202 -
203 - gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
204 -
205 - use pam && { rm -rv "${ED}/unwanted_files" || die ; }
206 -
207 - use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
208 -
209 - if ! use static-libs; then
210 - find "${ED}/" -name '*.la' -delete || die
211 - fi
212 -
213 - dobashcomp contrib/bash_completion.d/zfs
214 - bashcomp_alias zfs zpool
215 -
216 - # strip executable bit from conf.d file
217 - fperms 0644 /etc/conf.d/zfs
218 -
219 - if use python; then
220 - pushd contrib/pyzfs >/dev/null || die
221 - distutils-r1_src_install
222 - popd >/dev/null || die
223 - fi
224 -
225 - # enforce best available python implementation
226 - use minimal || python_fix_shebang "${ED}/bin"
227 -}
228 -
229 -pkg_postinst() {
230 - if use rootfs; then
231 - if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
232 - elog "root on zfs requires initramfs to boot"
233 - elog "the following packages known to provide one and tested on regular basis:"
234 - elog " sys-kernel/dracut"
235 - elog " sys-kernel/genkernel"
236 - fi
237 - fi
238 -
239 - if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
240 - einfo "Adding ${P} to the module database to ensure that the"
241 - einfo "kernel modules and userland utilities stay in sync."
242 - update_moduledb
243 - fi
244 -
245 - if systemd_is_booted || has_version sys-apps/systemd; then
246 - einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
247 - einfo "for default zfs systemd service configuration"
248 - else
249 - [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
250 - einfo "You should add zfs-import to the boot runlevel."
251 - [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
252 - einfo "You should add zfs-mount to the boot runlevel."
253 - [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
254 - einfo "You should add zfs-share to the default runlevel."
255 - [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
256 - einfo "You should add zfs-zed to the default runlevel."
257 - fi
258 -}
259 -
260 -pkg_postrm() {
261 - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
262 - remove_moduledb
263 - fi
264 -}