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: Fri, 10 May 2019 00:19:30
Message-Id: 1557447176.5f475748691223f48d0604339a8a1098729104c3.gyakovlev@gentoo
1 commit: 5f475748691223f48d0604339a8a1098729104c3
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 10 00:09:54 2019 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Fri May 10 00:12:56 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f475748
7
8 sys-fs/zfs: bump to 0.8.0_rc5
9
10 Package-Manager: Portage-2.3.66, Repoman-2.3.12
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 sys-fs/zfs/Manifest | 1 +
14 sys-fs/zfs/zfs-0.8.0_rc5.ebuild | 240 ++++++++++++++++++++++++++++++++++++++++
15 2 files changed, 241 insertions(+)
16
17 diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
18 index 7d8b4df3603..d461c803f80 100644
19 --- a/sys-fs/zfs/Manifest
20 +++ b/sys-fs/zfs/Manifest
21 @@ -2,3 +2,4 @@ DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3
22 DIST zfs-0.7.12.tar.gz 6565017 BLAKE2B 493df30ecce1f169e02d6c8262ba71cc9e7b01d5b17ce188004f522f0c93943b858434067cba8173ccb3e08cde24a1d3e8a3996b2e852f8bc35251f8c4ab3809 SHA512 278e411eac5fb2a91108671b64521c2bd5c08024d5829e1679d8f243dfc3c6317363ed9c79dabfddecf425acb6b3003eeaf4e7d991513cbcae4d2644f5d30bf2
23 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
24 DIST zfs-0.8.0-rc4.tar.gz 8874029 BLAKE2B 17dd408bfe5133339548c124529b22312c70f527cca9329a7198c415ee2010e03a967d06d6b56ba25c667c8586476daed97c812ffc26331827aac818eda27282 SHA512 0a1137cf5ed2859dd3876867c4f63b74f117847276a3d9de67736a92cbe5a0c9b2e599bb0e84664f5feb89be36188baacdcc2aa233b498fcfeb6fd946c8b73ea
25 +DIST zfs-0.8.0-rc5.tar.gz 8994022 BLAKE2B f29b9f6d264bbd04553f6855fbdf039808903eb02989e06082d9db8494723e611736db753fa4d27443527fbac189c1ee282ac89fdf799f6182ae428e178d0d10 SHA512 e54a3f9c7947baf619d737a832a545609bc03774a53f9a65147b8c23d9fb5148400a33d99216205a3e45821f8300108882c4eab9995778611775035441428551
26
27 diff --git a/sys-fs/zfs/zfs-0.8.0_rc5.ebuild b/sys-fs/zfs/zfs-0.8.0_rc5.ebuild
28 new file mode 100644
29 index 00000000000..aae398b670b
30 --- /dev/null
31 +++ b/sys-fs/zfs/zfs-0.8.0_rc5.ebuild
32 @@ -0,0 +1,240 @@
33 +# Copyright 1999-2019 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +DISTUTILS_OPTIONAL=1
39 +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
40 +
41 +inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev
42 +
43 +DESCRIPTION="Userland utilities for ZFS Linux kernel module"
44 +HOMEPAGE="https://zfsonlinux.org/"
45 +
46 +if [[ ${PV} == "9999" ]] ; then
47 + inherit autotools git-r3
48 + EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
49 +else
50 + MY_P="${PN}-${PV/_rc/-rc}"
51 + SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
52 + KEYWORDS="~amd64"
53 + S="${WORKDIR}/zfs-${PV%_rc*}"
54 +fi
55 +
56 +LICENSE="BSD-2 CDDL MIT"
57 +SLOT="0"
58 +IUSE="custom-cflags debug kernel-builtin python +rootfs test-suite static-libs"
59 +
60 +COMMON_DEPEND="
61 + ${PYTHON_DEPS}
62 + net-libs/libtirpc
63 + sys-apps/util-linux[static-libs?]
64 + sys-libs/zlib[static-libs(+)?]
65 + virtual/awk
66 + python? (
67 + virtual/python-cffi[${PYTHON_USEDEP}]
68 + )
69 +"
70 +
71 +BDEPEND="${COMMON_DEPEND}
72 + virtual/pkgconfig
73 + python? (
74 + dev-python/setuptools[${PYTHON_USEDEP}]
75 + )
76 +"
77 +
78 +RDEPEND="${COMMON_DEPEND}
79 + !=sys-apps/grep-2.13*
80 + !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
81 + !sys-fs/zfs-fuse
82 + !prefix? ( virtual/udev )
83 + sys-fs/udev-init-scripts
84 + rootfs? (
85 + app-arch/cpio
86 + app-misc/pax-utils
87 + !<sys-boot/grub-2.00-r2:2
88 + !<sys-kernel/genkernel-3.5.1.1
89 + !<sys-kernel/genkernel-next-67
90 + !<sys-kernel/bliss-initramfs-7.1.0
91 + !<sys-kernel/dracut-044-r1
92 + )
93 + test-suite? (
94 + sys-apps/util-linux
95 + sys-devel/bc
96 + sys-block/parted
97 + sys-fs/lsscsi
98 + sys-fs/mdadm
99 + sys-process/procps
100 + virtual/modutils
101 + )
102 +"
103 +
104 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
105 +
106 +RESTRICT="test"
107 +
108 +PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
109 +
110 +pkg_setup() {
111 + if use kernel_linux && use test-suite; then
112 + linux-info_pkg_setup
113 +
114 + if ! linux_config_exists; then
115 + ewarn "Cannot check the linux kernel configuration."
116 + else
117 + if use test-suite; then
118 + if linux_chkconfig_present BLK_DEV_LOOP; then
119 + eerror "The ZFS test suite requires loop device support enabled."
120 + eerror "Please enable it:"
121 + eerror " CONFIG_BLK_DEV_LOOP=y"
122 + eerror "in /usr/src/linux/.config or"
123 + eerror " Device Drivers --->"
124 + eerror " Block devices --->"
125 + eerror " [X] Loopback device support"
126 + fi
127 + fi
128 + fi
129 + fi
130 +}
131 +
132 +src_prepare() {
133 + default
134 +
135 + [[ ${PV} == "9999" ]] && eautoreconf
136 +
137 + # Update paths
138 + sed -e "s|/sbin/lsmod|/bin/lsmod|" \
139 + -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
140 + -e "s|/sbin/parted|/usr/sbin/parted|" \
141 + -i scripts/common.sh.in || die
142 +
143 + if use python; then
144 + pushd contrib/pyzfs >/dev/null || die
145 + distutils-r1_src_prepare
146 + popd >/dev/null || die
147 + fi
148 +}
149 +
150 +src_configure() {
151 + use custom-cflags || strip-flags
152 +
153 + local myconf=(
154 + --bindir="${EPREFIX}/bin"
155 + --enable-systemd
156 + --enable-sysvinit
157 + --sbindir="${EPREFIX}/sbin"
158 + --with-config=user
159 + --with-dracutdir="${EPREFIX}/usr/lib/dracut"
160 + --with-linux="${KV_DIR}"
161 + --with-linux-obj="${KV_OUT_DIR}"
162 + --with-udevdir="$(get_udevdir)"
163 + --with-systemdunitdir="$(systemd_get_systemunitdir)"
164 + --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
165 + $(use_enable debug)
166 + $(use_enable python pyzfs)
167 + )
168 +
169 + econf "${myconf[@]}"
170 +}
171 +
172 +src_compile() {
173 + default
174 + if use python; then
175 + pushd contrib/pyzfs >/dev/null || die
176 + distutils-r1_src_compile
177 + popd >/dev/null || die
178 + fi
179 +}
180 +
181 +src_install() {
182 + default
183 +
184 + gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
185 +
186 + use test-suite || rm -rf "${ED}/usr/share/zfs"
187 +
188 + dobashcomp contrib/bash_completion.d/zfs
189 + bashcomp_alias zfs zpool
190 +
191 + # strip executable bit from conf.d file
192 + fperms 0644 /etc/conf.d/zfs
193 +
194 + if use python; then
195 + pushd contrib/pyzfs >/dev/null || die
196 + distutils-r1_src_install
197 + popd >/dev/null || die
198 + fi
199 +
200 + # enforce best available python implementation
201 + python_setup
202 + python_fix_shebang "${ED}/bin"
203 +}
204 +
205 +pkg_postinst() {
206 + if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
207 + einfo "Adding ${P} to the module database to ensure that the"
208 + einfo "kernel modules and userland utilities stay in sync."
209 + update_moduledb
210 + fi
211 +
212 + if [[ -e "${EROOT}/etc/runlevels/boot/zfs" ]]; then
213 + einfo 'The zfs boot script has been split into the zfs-import,'
214 + einfo 'zfs-mount and zfs-share scripts.'
215 + einfo
216 + einfo 'You had the zfs script in your boot runlevel. For your'
217 + einfo 'convenience, it has been automatically removed and the three'
218 + einfo 'scripts that replace it have been configured to start.'
219 + einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
220 + einfo 'runlevel while the zfs-share script is in the default runlevel.'
221 +
222 + rm "${EROOT}/etc/runlevels/boot/zfs"
223 + ln -snf "${EROOT}/etc/init.d/zfs-import" \
224 + "${EROOT}/etc/runlevels/boot/zfs-import"
225 + ln -snf "${EROOT}/etc/init.d/zfs-mount" \
226 + "${EROOT}/etc/runlevels/boot/zfs-mount"
227 + ln -snf "${EROOT}/etc/init.d/zfs-share" \
228 + "${EROOT}/etc/runlevels/default/zfs-share"
229 + else
230 + [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
231 + einfo "You should add zfs-import to the boot runlevel."
232 + [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
233 + einfo "You should add zfs-mount to the boot runlevel."
234 + [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
235 + einfo "You should add zfs-share to the default runlevel."
236 + fi
237 +
238 + if [[ -e "${EROOT}/etc/runlevels/default/zed" ]]; then
239 + einfo 'The downstream OpenRC zed script has replaced by the upstream'
240 + einfo 'OpenRC zfs-zed script.'
241 + einfo
242 + einfo 'You had the zed script in your default runlevel. For your'
243 + einfo 'convenience, it has been automatically removed and the zfs-zed'
244 + einfo 'script that replaced it has been configured to start.'
245 +
246 + rm "${EROOT}/etc/runlevels/boot/zed"
247 + ln -snf "${EROOT}/etc/init.d/zfs-zed" \
248 + "${EROOT}/etc/runlevels/default/zfs-zed"
249 + else
250 + [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
251 + einfo "You should add zfs-zed to the default runlevel."
252 + fi
253 +
254 + if [[ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]]; then
255 + einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
256 + rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
257 + fi
258 +
259 + systemd_reenable zfs-zed.service
260 + systemd_reenable zfs-import-cache.service
261 + systemd_reenable zfs-import-scan.service
262 + systemd_reenable zfs-mount.service
263 + systemd_reenable zfs-share.service
264 + systemd_reenable zfs-import.target
265 + systemd_reenable zfs.target
266 +}
267 +
268 +pkg_postrm() {
269 + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
270 + remove_moduledb
271 + fi
272 +}