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, 28 May 2021 20:09:02
Message-Id: 1622232467.ec88e002187b178aac3e2c3191c0d59fd5a074bd.sam@gentoo
1 commit: ec88e002187b178aac3e2c3191c0d59fd5a074bd
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 28 20:07:47 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri May 28 20:07:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec88e002
7
8 sys-fs/zfs: drop 2.1.0_rc5
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_rc5.ebuild | 267 ----------------------------------------
14 2 files changed, 269 deletions(-)
15
16 diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
17 index c7165fe035f..514e285239e 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-rc5.tar.gz 34811108 BLAKE2B fd785dd9a77a55b734fd96526e5805cd8e90a517cef48bed95fccc4849f7be45210b3cc6f6bdfb30f3ee3a9a9814308eb1599c4df143aca46b23f968dc088a54 SHA512 37dd4f40a8ab8265a4f8c1d67d1a4327b1376bbd2d53b166261d501ffc01521deaa03f8bcce992158d50482def184b840d2596df6d9291697b1fc1938731d6d8
24 -DIST zfs-2.1.0-rc5.tar.gz.asc 195 BLAKE2B 452c211af7ad3b5f7e2b7bc96985305dabcedde0f70825353b18d45e569f2bbd39b717d7e7b790794735295ec5dcc4ed751f5256fffa7b892627056191f02b79 SHA512 85908fbb2cb49965ce015d20182aef035fbd76195a1a72aa36a48af05bd355a95998087ec3b6c73b6de6eebd66e578bef28db6ecbf679274ce6aade303b66cae
25 DIST zfs-2.1.0-rc6.tar.gz 34777294 BLAKE2B 0080b03a9cf9717ae2bc7674e340dffafd923467368d8941df9be5a21f081e88745297e1a8b2ac5059e9f346949bbeb759a5fc8bcdb60c3be49b0645389ec8b1 SHA512 696d525c1c738a508d04366f8ffd0142aebe4498efbf129c9d38fa7c67dbec83554f55a2c4a5d7647a03ca0df173c2720fe85edbc859195f4ca19e04d2adf143
26 DIST zfs-2.1.0-rc6.tar.gz.asc 195 BLAKE2B a1267b8faffc75ac70082e261c6053b2070cbad014c92051ebc82af56b21bbe2e72e01e44c0701ed255a3201330bb56b5e1a72e12c1ae9f15f72883b53c17ec6 SHA512 afc0eb839de6b0b21b3d781dd74dce9f6f668b7b9fc079ea764666e28d4d3228b8a80641b6d0084851bffedfc3406dc0f829242f6b4247d192f554ba45ce3a4c
27
28 diff --git a/sys-fs/zfs/zfs-2.1.0_rc5.ebuild b/sys-fs/zfs/zfs-2.1.0_rc5.ebuild
29 deleted file mode 100644
30 index 621ef35d32b..00000000000
31 --- a/sys-fs/zfs/zfs-2.1.0_rc5.ebuild
32 +++ /dev/null
33 @@ -1,267 +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 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 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} )
100 - !prefix? ( virtual/udev )
101 - sys-fs/udev-init-scripts
102 - virtual/awk
103 - rootfs? (
104 - app-arch/cpio
105 - app-misc/pax-utils
106 - !<sys-kernel/genkernel-3.5.1.1
107 - )
108 - test-suite? (
109 - sys-apps/kmod[tools]
110 - sys-apps/util-linux
111 - sys-devel/bc
112 - sys-block/parted
113 - sys-fs/lsscsi
114 - sys-fs/mdadm
115 - sys-process/procps
116 - )
117 -"
118 -
119 -REQUIRED_USE="
120 - !minimal? ( ${PYTHON_REQUIRED_USE} )
121 - python? ( !minimal )
122 - test-suite? ( !minimal )
123 -"
124 -
125 -RESTRICT="test"
126 -
127 -pkg_setup() {
128 - if use kernel_linux && use test-suite; then
129 - linux-info_pkg_setup
130 -
131 - if ! linux_config_exists; then
132 - ewarn "Cannot check the linux kernel configuration."
133 - else
134 - if use test-suite; then
135 - if linux_chkconfig_present BLK_DEV_LOOP; then
136 - eerror "The ZFS test suite requires loop device support enabled."
137 - eerror "Please enable it:"
138 - eerror " CONFIG_BLK_DEV_LOOP=y"
139 - eerror "in /usr/src/linux/.config or"
140 - eerror " Device Drivers --->"
141 - eerror " Block devices --->"
142 - eerror " [X] Loopback device support"
143 - fi
144 - fi
145 - fi
146 - fi
147 -}
148 -
149 -libsoversion_check() {
150 -
151 - local bugurl libzfs_sover
152 - bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
153 -
154 - libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
155 - | grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
156 - libzfs_sover="${libzfs_sover%%:*}"
157 -
158 - if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
159 - echo
160 - eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
161 - eerror "ebuild subslot does not match libzfs soversion!"
162 - eerror "libzfs soversion: ${libzfs_sover}"
163 - eerror "ebuild value: $(ver_cut 2 ${SLOT})"
164 - eerror "This is a bug in the ebuild, please use the following URL to report it"
165 - eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
166 - echo
167 - # we want to abort for releases, but just print a warning for live ebuild
168 - # to keep package installable
169 - [[ ${PV} == "9999" ]] || die
170 - fi
171 -}
172 -
173 -src_prepare() {
174 - default
175 - libsoversion_check
176 -
177 - if [[ ${PV} == "9999" ]]; then
178 - eautoreconf
179 - else
180 - # Set revision number
181 - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
182 - fi
183 -
184 - if use python; then
185 - pushd contrib/pyzfs >/dev/null || die
186 - distutils-r1_src_prepare
187 - popd >/dev/null || die
188 - fi
189 -
190 - # prevent errors showing up on zfs-mount stop, #647688
191 - # openrc will unmount all filesystems anyway.
192 - sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
193 -}
194 -
195 -src_configure() {
196 - use custom-cflags || strip-flags
197 - use minimal || python_setup
198 -
199 - local myconf=(
200 - --bindir="${EPREFIX}/bin"
201 - --enable-shared
202 - --enable-systemd
203 - --enable-sysvinit
204 - --localstatedir="${EPREFIX}/var"
205 - --sbindir="${EPREFIX}/sbin"
206 - --with-config=user
207 - --with-dracutdir="${EPREFIX}/usr/lib/dracut"
208 - --with-linux="${KV_DIR}"
209 - --with-linux-obj="${KV_OUT_DIR}"
210 - --with-udevdir="$(get_udevdir)"
211 - --with-pamconfigsdir="${EPREFIX}/unwanted_files"
212 - --with-pammoduledir="$(getpam_mod_dir)"
213 - --with-systemdunitdir="$(systemd_get_systemunitdir)"
214 - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
215 - --with-vendor=gentoo
216 - $(use_enable debug)
217 - $(use_enable nls)
218 - $(use_enable pam)
219 - $(use_enable python pyzfs)
220 - $(use_enable static-libs static)
221 - $(usex minimal --without-python --with-python="${EPYTHON}")
222 - )
223 -
224 - econf "${myconf[@]}"
225 -}
226 -
227 -src_compile() {
228 - default
229 - if use python; then
230 - pushd contrib/pyzfs >/dev/null || die
231 - distutils-r1_src_compile
232 - popd >/dev/null || die
233 - fi
234 -}
235 -
236 -src_install() {
237 - default
238 -
239 - gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
240 -
241 - use pam && { rm -rv "${ED}/unwanted_files" || die ; }
242 -
243 - use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
244 -
245 - if ! use static-libs; then
246 - find "${ED}" -name '*.la' -delete || die
247 - fi
248 -
249 - dobashcomp contrib/bash_completion.d/zfs
250 - bashcomp_alias zfs zpool
251 -
252 - # strip executable bit from conf.d file
253 - fperms 0644 /etc/conf.d/zfs
254 -
255 - if use python; then
256 - pushd contrib/pyzfs >/dev/null || die
257 - distutils-r1_src_install
258 - popd >/dev/null || die
259 - fi
260 -
261 - # enforce best available python implementation
262 - use minimal || python_fix_shebang "${ED}/bin"
263 -}
264 -
265 -pkg_postinst() {
266 - if use rootfs; then
267 - if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
268 - elog "Root on zfs requires an initramfs to boot"
269 - elog "The following packages provide one and are tested on a regular basis:"
270 - elog " sys-kernel/dracut"
271 - elog " sys-kernel/genkernel"
272 - fi
273 - fi
274 -
275 - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
276 - einfo "Adding ${P} to the module database to ensure that the"
277 - einfo "kernel modules and userland utilities stay in sync."
278 - update_moduledb
279 - fi
280 -
281 - if systemd_is_booted || has_version sys-apps/systemd; then
282 - einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
283 - einfo "for default zfs systemd service configuration"
284 - else
285 - [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
286 - einfo "You should add zfs-import to the boot runlevel."
287 - [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
288 - einfo "You should add zfs-mount to the boot runlevel."
289 - [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
290 - einfo "You should add zfs-share to the default runlevel."
291 - [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
292 - einfo "You should add zfs-zed to the default runlevel."
293 - fi
294 -}
295 -
296 -pkg_postrm() {
297 - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
298 - remove_moduledb
299 - fi
300 -}