1 |
commit: 0f5dedeb618c1870de216bfbef06cf205a9b3d4e |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 29 23:07:10 2021 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 29 23:08:34 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5dedeb |
7 |
|
8 |
sys-fs/zfs: drop 2.1.0-r1 |
9 |
|
10 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
11 |
|
12 |
sys-fs/zfs/Manifest | 2 - |
13 |
sys-fs/zfs/zfs-2.1.0-r1.ebuild | 293 ----------------------------------------- |
14 |
2 files changed, 295 deletions(-) |
15 |
|
16 |
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest |
17 |
index 6951557c4a7..2901db693d5 100644 |
18 |
--- a/sys-fs/zfs/Manifest |
19 |
+++ b/sys-fs/zfs/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/zfs-2.1.0-r1.ebuild b/sys-fs/zfs/zfs-2.1.0-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index 2ab356846cf..00000000000 |
32 |
--- a/sys-fs/zfs/zfs-2.1.0-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,293 +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 |
-DISTUTILS_OPTIONAL=1 |
41 |
-DISTUTILS_USE_SETUPTOOLS=manual |
42 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
43 |
- |
44 |
-inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript |
45 |
- |
46 |
-DESCRIPTION="Userland utilities for ZFS Linux kernel module" |
47 |
-HOMEPAGE="https://github.com/openzfs/zfs" |
48 |
- |
49 |
-if [[ ${PV} == "9999" ]]; then |
50 |
- inherit git-r3 linux-mod |
51 |
- EGIT_REPO_URI="https://github.com/openzfs/zfs.git" |
52 |
-else |
53 |
- VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc |
54 |
- inherit verify-sig |
55 |
- |
56 |
- MY_P="${P/_rc/-rc}" |
57 |
- SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" |
58 |
- SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )" |
59 |
- S="${WORKDIR}/${P%_rc?}" |
60 |
- |
61 |
- if [[ ${PV} != *_rc* ]]; then |
62 |
- KEYWORDS="~amd64 ~arm64 ~ppc64" |
63 |
- fi |
64 |
-fi |
65 |
- |
66 |
-LICENSE="BSD-2 CDDL MIT" |
67 |
-# just libzfs soname major for now. |
68 |
-# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. |
69 |
-# see libsoversion_check() below as well |
70 |
-SLOT="0/5" |
71 |
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" |
72 |
- |
73 |
-DEPEND=" |
74 |
- net-libs/libtirpc |
75 |
- sys-apps/util-linux |
76 |
- sys-libs/zlib |
77 |
- virtual/libudev:= |
78 |
- dev-libs/openssl:0= |
79 |
- !minimal? ( ${PYTHON_DEPS} ) |
80 |
- pam? ( sys-libs/pam ) |
81 |
- python? ( |
82 |
- virtual/python-cffi[${PYTHON_USEDEP}] |
83 |
- ) |
84 |
-" |
85 |
- |
86 |
-BDEPEND="virtual/awk |
87 |
- virtual/pkgconfig |
88 |
- nls? ( sys-devel/gettext ) |
89 |
- python? ( |
90 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
91 |
- || ( |
92 |
- dev-python/packaging[${PYTHON_USEDEP}] |
93 |
- dev-python/distlib[${PYTHON_USEDEP}] |
94 |
- ) |
95 |
- ) |
96 |
-" |
97 |
- |
98 |
-if [[ ${PV} != "9999" ]] ; then |
99 |
- BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )" |
100 |
-fi |
101 |
- |
102 |
-# awk is used for some scripts, completions, and the Dracut module |
103 |
-RDEPEND="${DEPEND} |
104 |
- !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] ) |
105 |
- !prefix? ( virtual/udev ) |
106 |
- sys-fs/udev-init-scripts |
107 |
- virtual/awk |
108 |
- dist-kernel? ( virtual/dist-kernel:= ) |
109 |
- rootfs? ( |
110 |
- app-arch/cpio |
111 |
- app-misc/pax-utils |
112 |
- !<sys-kernel/genkernel-3.5.1.1 |
113 |
- ) |
114 |
- test-suite? ( |
115 |
- sys-apps/kmod[tools] |
116 |
- sys-apps/util-linux |
117 |
- sys-devel/bc |
118 |
- sys-block/parted |
119 |
- sys-fs/lsscsi |
120 |
- sys-fs/mdadm |
121 |
- sys-process/procps |
122 |
- ) |
123 |
-" |
124 |
- |
125 |
-REQUIRED_USE=" |
126 |
- !minimal? ( ${PYTHON_REQUIRED_USE} ) |
127 |
- python? ( !minimal ) |
128 |
- test-suite? ( !minimal ) |
129 |
-" |
130 |
- |
131 |
-RESTRICT="test" |
132 |
- |
133 |
-PATCHES=( "${FILESDIR}/2.0.4-scrub-timers.patch" ) |
134 |
- |
135 |
-pkg_pretend() { |
136 |
- use rootfs || return 0 |
137 |
- |
138 |
- if has_version virtual/dist-kernel && ! use dist-kernel; then |
139 |
- ewarn "You have virtual/dist-kernel installed, but" |
140 |
- ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" |
141 |
- ewarn "It's recommended to globally enable dist-kernel USE flag" |
142 |
- ewarn "to auto-trigger initrd rebuilds with kernel updates" |
143 |
- fi |
144 |
-} |
145 |
- |
146 |
-pkg_setup() { |
147 |
- if use kernel_linux; then |
148 |
- linux-info_pkg_setup |
149 |
- |
150 |
- if ! linux_config_exists; then |
151 |
- ewarn "Cannot check the linux kernel configuration." |
152 |
- else |
153 |
- if use test-suite; then |
154 |
- if linux_chkconfig_present BLK_DEV_LOOP; then |
155 |
- eerror "The ZFS test suite requires loop device support enabled." |
156 |
- eerror "Please enable it:" |
157 |
- eerror " CONFIG_BLK_DEV_LOOP=y" |
158 |
- eerror "in /usr/src/linux/.config or" |
159 |
- eerror " Device Drivers --->" |
160 |
- eerror " Block devices --->" |
161 |
- eerror " [X] Loopback device support" |
162 |
- fi |
163 |
- fi |
164 |
- fi |
165 |
- fi |
166 |
-} |
167 |
- |
168 |
-libsoversion_check() { |
169 |
- |
170 |
- local bugurl libzfs_sover |
171 |
- bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages" |
172 |
- |
173 |
- libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \ |
174 |
- | grep -Eo '[0-9]+:[0-9]+:[0-9]+')" |
175 |
- libzfs_sover="${libzfs_sover%%:*}" |
176 |
- |
177 |
- if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then |
178 |
- echo |
179 |
- eerror "BUG BUG BUG BUG BUG BUG BUG BUG" |
180 |
- eerror "ebuild subslot does not match libzfs soversion!" |
181 |
- eerror "libzfs soversion: ${libzfs_sover}" |
182 |
- eerror "ebuild value: $(ver_cut 2 ${SLOT})" |
183 |
- eerror "This is a bug in the ebuild, please use the following URL to report it" |
184 |
- eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot" |
185 |
- echo |
186 |
- # we want to abort for releases, but just print a warning for live ebuild |
187 |
- # to keep package installable |
188 |
- [[ ${PV} == "9999" ]] || die |
189 |
- fi |
190 |
-} |
191 |
- |
192 |
-src_prepare() { |
193 |
- default |
194 |
- libsoversion_check |
195 |
- |
196 |
- # Run unconditionally (bug #792627) |
197 |
- eautoreconf |
198 |
- |
199 |
- if [[ ${PV} != "9999" ]]; then |
200 |
- # Set revision number |
201 |
- sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" |
202 |
- fi |
203 |
- |
204 |
- if use python; then |
205 |
- pushd contrib/pyzfs >/dev/null || die |
206 |
- distutils-r1_src_prepare |
207 |
- popd >/dev/null || die |
208 |
- fi |
209 |
- |
210 |
- # prevent errors showing up on zfs-mount stop, #647688 |
211 |
- # openrc will unmount all filesystems anyway. |
212 |
- sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die |
213 |
-} |
214 |
- |
215 |
-src_configure() { |
216 |
- use custom-cflags || strip-flags |
217 |
- use minimal || python_setup |
218 |
- |
219 |
- local myconf=( |
220 |
- --bindir="${EPREFIX}/bin" |
221 |
- --enable-shared |
222 |
- --enable-systemd |
223 |
- --enable-sysvinit |
224 |
- --localstatedir="${EPREFIX}/var" |
225 |
- --sbindir="${EPREFIX}/sbin" |
226 |
- --with-config=user |
227 |
- --with-dracutdir="${EPREFIX}/usr/lib/dracut" |
228 |
- --with-linux="${KV_DIR}" |
229 |
- --with-linux-obj="${KV_OUT_DIR}" |
230 |
- --with-udevdir="$(get_udevdir)" |
231 |
- --with-pamconfigsdir="${EPREFIX}/unwanted_files" |
232 |
- --with-pammoduledir="$(getpam_mod_dir)" |
233 |
- --with-systemdunitdir="$(systemd_get_systemunitdir)" |
234 |
- --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" |
235 |
- --with-vendor=gentoo |
236 |
- $(use_enable debug) |
237 |
- $(use_enable nls) |
238 |
- $(use_enable pam) |
239 |
- $(use_enable python pyzfs) |
240 |
- --disable-static |
241 |
- $(usex minimal --without-python --with-python="${EPYTHON}") |
242 |
- ) |
243 |
- |
244 |
- econf "${myconf[@]}" |
245 |
-} |
246 |
- |
247 |
-src_compile() { |
248 |
- default |
249 |
- if use python; then |
250 |
- pushd contrib/pyzfs >/dev/null || die |
251 |
- distutils-r1_src_compile |
252 |
- popd >/dev/null || die |
253 |
- fi |
254 |
-} |
255 |
- |
256 |
-src_install() { |
257 |
- default |
258 |
- |
259 |
- gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool |
260 |
- |
261 |
- use pam && { rm -rv "${ED}/unwanted_files" || die ; } |
262 |
- |
263 |
- use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } |
264 |
- |
265 |
- find "${ED}" -name '*.la' -delete || die |
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 |
-} |