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