1 |
commit: acbeee5df18e31c9dafab27ff6afaf62ae64071c |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 3 19:57:35 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 3 20:04:10 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acbeee5d |
7 |
|
8 |
sys-fs/zfs: drop 0.8.4 |
9 |
|
10 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
sys-fs/zfs/Manifest | 1 - |
14 |
sys-fs/zfs/files/0.8.4-initconfdir.patch | 35 ----- |
15 |
sys-fs/zfs/zfs-0.8.4-r2.ebuild | 223 ------------------------------- |
16 |
3 files changed, 259 deletions(-) |
17 |
|
18 |
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest |
19 |
index 128c485727a..103e10fa8d8 100644 |
20 |
--- a/sys-fs/zfs/Manifest |
21 |
+++ b/sys-fs/zfs/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1 |
24 |
DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773 |
25 |
DIST zfs-2.0.0-rc4.tar.gz 12861762 BLAKE2B 638eb426955de38efbbb390cb02642298dd73caa5d9c9e28d8aea89bb40967c251bbbe66fbd38e08c922fb1c6fa935c959572abf237ea57ee7d9a5982693e275 SHA512 3972b92c7c0e92416fcde1fa01e7d1c20046de2e21d83a6694d0dc8753f13009b38f0f656202364da85b798886feffd06292b5fd5d23b0b3afc4f81fd86a540b |
26 |
|
27 |
diff --git a/sys-fs/zfs/files/0.8.4-initconfdir.patch b/sys-fs/zfs/files/0.8.4-initconfdir.patch |
28 |
deleted file mode 100644 |
29 |
index aac40896f39..00000000000 |
30 |
--- a/sys-fs/zfs/files/0.8.4-initconfdir.patch |
31 |
+++ /dev/null |
32 |
@@ -1,35 +0,0 @@ |
33 |
-From 5dbe98184278878746a5f548fead1d2ef1e98dbe Mon Sep 17 00:00:00 2001 |
34 |
-From: Georgy Yakovlev <gyakovlev@g.o> |
35 |
-Date: Tue, 26 May 2020 16:44:54 -0700 |
36 |
-Subject: [PATCH] 0.8.4 initconfdir |
37 |
- |
38 |
-fix for https://github.com/openzfs/zfs/issues/10375 |
39 |
- |
40 |
---- |
41 |
- etc/zfs/Makefile.am | 1 + |
42 |
- etc/zfs/Makefile.in | 9 +++++---- |
43 |
- 2 files changed, 6 insertions(+), 4 deletions(-) |
44 |
- |
45 |
-diff --git a/etc/zfs/Makefile.am b/openzfs/etc/zfs/Makefile.am |
46 |
-index 81567a4..5370f41 100644 |
47 |
---- a/etc/zfs/Makefile.am |
48 |
-+++ b/etc/zfs/Makefile.am |
49 |
-@@ -1,4 +1,5 @@ |
50 |
- pkgsysconfdir = $(sysconfdir)/zfs |
51 |
-+initconfdir = $(DEFAULT_INITCONF_DIR) |
52 |
- |
53 |
- pkgsysconf_DATA = \ |
54 |
- vdev_id.conf.alias.example \ |
55 |
-diff --git a/etc/zfs/Makefile.in b/etc/zfs/Makefile.in |
56 |
-index fb02811..795d3b1 100644 |
57 |
-@@ -571,6 +571,7 @@ udevdir = @udevdir@ |
58 |
- udevruledir = @udevruledir@ |
59 |
- zfsexecdir = @zfsexecdir@ |
60 |
- pkgsysconfdir = $(sysconfdir)/zfs |
61 |
-+initconfdir = $(DEFAULT_INITCONF_DIR) |
62 |
- pkgsysconf_DATA = \ |
63 |
- vdev_id.conf.alias.example \ |
64 |
- vdev_id.conf.sas_direct.example \ |
65 |
--- |
66 |
-2.26.2 |
67 |
- |
68 |
|
69 |
diff --git a/sys-fs/zfs/zfs-0.8.4-r2.ebuild b/sys-fs/zfs/zfs-0.8.4-r2.ebuild |
70 |
deleted file mode 100644 |
71 |
index 3bcbb4af433..00000000000 |
72 |
--- a/sys-fs/zfs/zfs-0.8.4-r2.ebuild |
73 |
+++ /dev/null |
74 |
@@ -1,223 +0,0 @@ |
75 |
-# Copyright 1999-2020 Gentoo Authors |
76 |
-# Distributed under the terms of the GNU General Public License v2 |
77 |
- |
78 |
-EAPI=7 |
79 |
- |
80 |
-DISTUTILS_OPTIONAL=1 |
81 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
82 |
- |
83 |
-inherit autotools bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript |
84 |
- |
85 |
-DESCRIPTION="Userland utilities for ZFS Linux kernel module" |
86 |
-HOMEPAGE="https://github.com/openzfs/zfs" |
87 |
- |
88 |
-if [[ ${PV} == "9999" ]] ; then |
89 |
- inherit git-r3 linux-mod |
90 |
- EGIT_REPO_URI="https://github.com/openzfs/zfs.git" |
91 |
-else |
92 |
- SRC_URI="https://github.com/openzfs/${PN}/releases/download/${P}/${P}.tar.gz" |
93 |
- KEYWORDS="amd64 arm64 ppc64" |
94 |
-fi |
95 |
- |
96 |
-LICENSE="BSD-2 CDDL MIT" |
97 |
-SLOT="0" |
98 |
-IUSE="custom-cflags debug kernel-builtin libressl minimal nls python +rootfs test-suite static-libs" |
99 |
- |
100 |
-DEPEND=" |
101 |
- net-libs/libtirpc[static-libs?] |
102 |
- sys-apps/util-linux[static-libs?] |
103 |
- sys-libs/zlib[static-libs(+)?] |
104 |
- virtual/awk |
105 |
- virtual/libudev[static-libs(-)?] |
106 |
- libressl? ( dev-libs/libressl:0=[static-libs?] ) |
107 |
- !libressl? ( dev-libs/openssl:0=[static-libs?] ) |
108 |
- !minimal? ( ${PYTHON_DEPS} ) |
109 |
- python? ( |
110 |
- virtual/python-cffi[${PYTHON_USEDEP}] |
111 |
- ) |
112 |
-" |
113 |
- |
114 |
-BDEPEND="virtual/awk |
115 |
- virtual/pkgconfig |
116 |
- nls? ( sys-devel/gettext ) |
117 |
- python? ( |
118 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
119 |
- ) |
120 |
-" |
121 |
- |
122 |
-RDEPEND="${DEPEND} |
123 |
- !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} ) |
124 |
- !prefix? ( virtual/udev ) |
125 |
- sys-fs/udev-init-scripts |
126 |
- rootfs? ( |
127 |
- app-arch/cpio |
128 |
- app-misc/pax-utils |
129 |
- !<sys-kernel/genkernel-3.5.1.1 |
130 |
- ) |
131 |
- test-suite? ( |
132 |
- sys-apps/kmod[tools] |
133 |
- sys-apps/util-linux |
134 |
- sys-devel/bc |
135 |
- sys-block/parted |
136 |
- sys-fs/lsscsi |
137 |
- sys-fs/mdadm |
138 |
- sys-process/procps |
139 |
- ) |
140 |
-" |
141 |
- |
142 |
-REQUIRED_USE=" |
143 |
- !minimal? ( ${PYTHON_REQUIRED_USE} ) |
144 |
- python? ( !minimal ) |
145 |
- test-suite? ( !minimal ) |
146 |
-" |
147 |
- |
148 |
-RESTRICT="test" |
149 |
- |
150 |
-PATCHES=( |
151 |
- "${FILESDIR}/bash-completion-sudo.patch" |
152 |
- "${FILESDIR}/${PV}-initconfdir.patch" |
153 |
-) |
154 |
- |
155 |
-pkg_setup() { |
156 |
- if use kernel_linux && use test-suite; then |
157 |
- linux-info_pkg_setup |
158 |
- |
159 |
- if ! linux_config_exists; then |
160 |
- ewarn "Cannot check the linux kernel configuration." |
161 |
- else |
162 |
- if use test-suite; then |
163 |
- if linux_chkconfig_present BLK_DEV_LOOP; then |
164 |
- eerror "The ZFS test suite requires loop device support enabled." |
165 |
- eerror "Please enable it:" |
166 |
- eerror " CONFIG_BLK_DEV_LOOP=y" |
167 |
- eerror "in /usr/src/linux/.config or" |
168 |
- eerror " Device Drivers --->" |
169 |
- eerror " Block devices --->" |
170 |
- eerror " [X] Loopback device support" |
171 |
- fi |
172 |
- fi |
173 |
- fi |
174 |
- fi |
175 |
-} |
176 |
- |
177 |
-src_prepare() { |
178 |
- default |
179 |
- |
180 |
- if [[ ${PV} == "9999" ]]; then |
181 |
- eautoreconf |
182 |
- else |
183 |
- # Set revision number |
184 |
- sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" |
185 |
- fi |
186 |
- |
187 |
- if use python; then |
188 |
- pushd contrib/pyzfs >/dev/null || die |
189 |
- distutils-r1_src_prepare |
190 |
- popd >/dev/null || die |
191 |
- fi |
192 |
- |
193 |
- # prevent errors showing up on zfs-mount stop, #647688 |
194 |
- # openrc will unmount all filesystems anyway. |
195 |
- sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die |
196 |
-} |
197 |
- |
198 |
-src_configure() { |
199 |
- use custom-cflags || strip-flags |
200 |
- use minimal || python_setup |
201 |
- |
202 |
- local myconf=( |
203 |
- --bindir="${EPREFIX}/bin" |
204 |
- --enable-shared |
205 |
- --enable-systemd |
206 |
- --enable-sysvinit |
207 |
- --localstatedir="${EPREFIX}/var" |
208 |
- --sbindir="${EPREFIX}/sbin" |
209 |
- --with-config=user |
210 |
- --with-dracutdir="${EPREFIX}/usr/lib/dracut" |
211 |
- --with-linux="${KV_DIR}" |
212 |
- --with-linux-obj="${KV_OUT_DIR}" |
213 |
- --with-udevdir="$(get_udevdir)" |
214 |
- --with-systemdunitdir="$(systemd_get_systemunitdir)" |
215 |
- --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" |
216 |
- $(use_enable debug) |
217 |
- $(use_enable nls) |
218 |
- $(use_enable python pyzfs) |
219 |
- $(use_enable static-libs static) |
220 |
- $(usex minimal --without-python --with-python="${EPYTHON}") |
221 |
- ) |
222 |
- |
223 |
- CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}" |
224 |
-} |
225 |
- |
226 |
-src_compile() { |
227 |
- default |
228 |
- if use python; then |
229 |
- pushd contrib/pyzfs >/dev/null || die |
230 |
- distutils-r1_src_compile |
231 |
- popd >/dev/null || die |
232 |
- fi |
233 |
-} |
234 |
- |
235 |
-src_install() { |
236 |
- default |
237 |
- |
238 |
- gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core |
239 |
- |
240 |
- use test-suite || rm -rf "${ED}/usr/share/zfs" |
241 |
- |
242 |
- if ! use static-libs; then |
243 |
- find "${ED}/" -name '*.la' -delete || die |
244 |
- fi |
245 |
- |
246 |
- dobashcomp contrib/bash_completion.d/zfs |
247 |
- bashcomp_alias zfs zpool |
248 |
- |
249 |
- # strip executable bit from conf.d file |
250 |
- fperms 0644 /etc/conf.d/zfs |
251 |
- |
252 |
- if use python; then |
253 |
- pushd contrib/pyzfs >/dev/null || die |
254 |
- distutils-r1_src_install |
255 |
- popd >/dev/null || die |
256 |
- fi |
257 |
- |
258 |
- # enforce best available python implementation |
259 |
- use minimal || python_fix_shebang "${ED}/bin" |
260 |
-} |
261 |
- |
262 |
-pkg_postinst() { |
263 |
- if use rootfs; then |
264 |
- if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then |
265 |
- elog "root on zfs requires initramfs to boot" |
266 |
- elog "the following packages known to provide one and tested on regular basis:" |
267 |
- elog " sys-kernel/dracut" |
268 |
- elog " sys-kernel/genkernel" |
269 |
- fi |
270 |
- fi |
271 |
- |
272 |
- if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then |
273 |
- einfo "Adding ${P} to the module database to ensure that the" |
274 |
- einfo "kernel modules and userland utilities stay in sync." |
275 |
- update_moduledb |
276 |
- fi |
277 |
- |
278 |
- if systemd_is_booted || has_version sys-apps/systemd; then |
279 |
- einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" |
280 |
- einfo "for default zfs systemd service configuration" |
281 |
- else |
282 |
- [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ |
283 |
- einfo "You should add zfs-import to the boot runlevel." |
284 |
- [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ |
285 |
- einfo "You should add zfs-mount to the boot runlevel." |
286 |
- [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ |
287 |
- einfo "You should add zfs-share to the default runlevel." |
288 |
- [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ |
289 |
- einfo "You should add zfs-zed to the default runlevel." |
290 |
- fi |
291 |
-} |
292 |
- |
293 |
-pkg_postrm() { |
294 |
- if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then |
295 |
- remove_moduledb |
296 |
- fi |
297 |
-} |