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: Wed, 14 Aug 2019 06:05:26
Message-Id: 1565762380.9e7c7b0f1a6fde0e35d4976ec1fa517d36a16b36.gyakovlev@gentoo
1 commit: 9e7c7b0f1a6fde0e35d4976ec1fa517d36a16b36
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 14 05:59:40 2019 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 14 05:59:40 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e7c7b0f
7
8 sys-fs/zfs: drop 0.6.5.11-r2
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 sys-fs/zfs/Manifest | 1 -
14 sys-fs/zfs/zfs-0.6.5.11-r2.ebuild | 212 --------------------------------------
15 2 files changed, 213 deletions(-)
16
17 diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
18 index 29e419297f2..daccededfad 100644
19 --- a/sys-fs/zfs/Manifest
20 +++ b/sys-fs/zfs/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
23 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
24 DIST zfs-0.8.1.tar.gz 8668360 BLAKE2B f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b SHA512 1fb3957f65dbe94edaffcedb5b2694390dc14e472c11f7e63184a9ea6a774e79a43d47a2d789b7ced233fc67c76583bf7d5c1bda0692bb07929673e2a57f4667
25
26 diff --git a/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild b/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild
27 deleted file mode 100644
28 index 10a8985e6e6..00000000000
29 --- a/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild
30 +++ /dev/null
31 @@ -1,212 +0,0 @@
32 -# Copyright 1999-2019 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI="5"
36 -PYTHON_COMPAT=( python{2_7,3_5} )
37 -
38 -if [ ${PV} == "9999" ] ; then
39 - inherit git-r3 linux-mod
40 - AUTOTOOLS_AUTORECONF="1"
41 - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
42 -else
43 - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
44 - KEYWORDS="amd64"
45 -fi
46 -
47 -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev usr-ldscript
48 -
49 -DESCRIPTION="Userland utilities for ZFS Linux kernel module"
50 -HOMEPAGE="https://zfsonlinux.org/"
51 -
52 -LICENSE="BSD-2 CDDL MIT"
53 -SLOT="0"
54 -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
55 -RESTRICT="test"
56 -
57 -COMMON_DEPEND="
58 - net-libs/libtirpc
59 - sys-apps/util-linux[static-libs?]
60 - sys-libs/zlib[static-libs(+)?]
61 - virtual/awk
62 -"
63 -DEPEND="${COMMON_DEPEND}
64 - virtual/pkgconfig
65 -"
66 -
67 -# Adding glibc >= 2.25 blocker for ZFS versions lower
68 -# than 0.7.0, due to bug 617628.
69 -RDEPEND="${COMMON_DEPEND}
70 - !>=sys-libs/glibc-2.25
71 - !=sys-apps/grep-2.13*
72 - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
73 - !sys-fs/zfs-fuse
74 - !prefix? ( virtual/udev )
75 - test-suite? (
76 - sys-apps/util-linux
77 - sys-devel/bc
78 - sys-block/parted
79 - sys-fs/lsscsi
80 - sys-fs/mdadm
81 - sys-process/procps
82 - virtual/modutils
83 - )
84 - rootfs? (
85 - app-arch/cpio
86 - app-misc/pax-utils
87 - !<sys-boot/grub-2.00-r2:2
88 - )
89 - sys-fs/udev-init-scripts
90 -"
91 -
92 -AT_M4DIR="config"
93 -AUTOTOOLS_IN_SOURCE_BUILD="1"
94 -
95 -pkg_setup() {
96 - if use kernel_linux && use test-suite; then
97 - linux-info_pkg_setup
98 - if ! linux_config_exists; then
99 - ewarn "Cannot check the linux kernel configuration."
100 - else
101 - # recheck that we don't have usblp to collide with libusb
102 - if use test-suite; then
103 - if linux_chkconfig_present BLK_DEV_LOOP; then
104 - eerror "The ZFS test suite requires loop device support enabled."
105 - eerror "Please enable it:"
106 - eerror " CONFIG_BLK_DEV_LOOP=y"
107 - eerror "in /usr/src/linux/.config or"
108 - eerror " Device Drivers --->"
109 - eerror " Block devices --->"
110 - eerror " [ ] Loopback device support"
111 - fi
112 - fi
113 - fi
114 - fi
115 -
116 -}
117 -
118 -src_prepare() {
119 - # Update paths
120 - sed -e "s|/sbin/lsmod|/bin/lsmod|" \
121 - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
122 - -e "s|/sbin/parted|/usr/sbin/parted|" \
123 - -i scripts/common.sh.in
124 -
125 - autotools-utils_src_prepare
126 -}
127 -
128 -src_configure() {
129 - use custom-cflags || strip-flags
130 - local myeconfargs=(
131 - --bindir="${EPREFIX}/bin"
132 - --sbindir="${EPREFIX}/sbin"
133 - --with-config=user
134 - --with-dracutdir="${EPREFIX}/usr/lib/dracut"
135 - --with-linux="${KV_DIR}"
136 - --with-linux-obj="${KV_OUT_DIR}"
137 - --with-udevdir="$(get_udevdir)"
138 - --with-blkid
139 - --with-systemdunitdir="$(systemd_get_systemunitdir)"
140 - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
141 - $(use_enable debug)
142 - )
143 - autotools-utils_src_configure
144 -
145 - # prepare systemd unit and helper script
146 - cat "${FILESDIR}/zfs.service.in" | \
147 - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
148 - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
149 - > "${T}/zfs.service" || die
150 - cat "${FILESDIR}/zfs-init.sh.in" | \
151 - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
152 - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
153 - > "${T}/zfs-init.sh" || die
154 -}
155 -
156 -src_install() {
157 - autotools-utils_src_install
158 - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
159 - use test-suite || rm -rf "${ED}usr/share/zfs"
160 -
161 - newbashcomp "${FILESDIR}/bash-completion-r1" zfs
162 - bashcomp_alias zfs zpool
163 -
164 - exeinto /usr/libexec
165 - doexe "${T}/zfs-init.sh"
166 - systemd_dounit "${T}/zfs.service"
167 -}
168 -
169 -pkg_postinst() {
170 - if ! use kernel-builtin && [ ${PV} = "9999" ]
171 - then
172 - einfo "Adding ${P} to the module database to ensure that the"
173 - einfo "kernel modules and userland utilities stay in sync."
174 - update_moduledb
175 - fi
176 -
177 - if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
178 - then
179 - einfo 'The zfs boot script has been split into the zfs-import,'
180 - einfo 'zfs-mount and zfs-share scripts.'
181 - einfo
182 - einfo 'You had the zfs script in your boot runlevel. For your'
183 - einfo 'convenience, it has been automatically removed and the three'
184 - einfo 'scripts that replace it have been configured to start.'
185 - einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
186 - einfo 'runlevel while the zfs-share script is in the default runlevel.'
187 -
188 - rm "${EROOT}etc/runlevels/boot/zfs"
189 - ln -snf "${EROOT}etc/init.d/zfs-import" \
190 - "${EROOT}etc/runlevels/boot/zfs-import"
191 - ln -snf "${EROOT}etc/init.d/zfs-mount" \
192 - "${EROOT}etc/runlevels/boot/zfs-mount"
193 - ln -snf "${EROOT}etc/init.d/zfs-share" \
194 - "${EROOT}etc/runlevels/default/zfs-share"
195 - else
196 - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
197 - einfo "You should add zfs-import to the boot runlevel."
198 - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
199 - einfo "You should add zfs-mount to the boot runlevel."
200 - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
201 - einfo "You should add zfs-share to the default runlevel."
202 - fi
203 -
204 - if [ -e "${EROOT}etc/runlevels/default/zed" ]
205 - then
206 - einfo 'The downstream OpenRC zed script has replaced by the upstream'
207 - einfo 'OpenRC zfs-zed script.'
208 - einfo
209 - einfo 'You had the zed script in your default runlevel. For your'
210 - einfo 'convenience, it has been automatically removed and the zfs-zed'
211 - einfo 'script that replaced it has been configured to start.'
212 -
213 - rm "${EROOT}etc/runlevels/boot/zed"
214 - ln -snf "${EROOT}etc/init.d/zfs-sed" \
215 - "${EROOT}etc/runlevels/default/zfs-zed"
216 - else
217 - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
218 - einfo "You should add zfs-zed to the default runlevel."
219 - fi
220 -
221 - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
222 - then
223 - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
224 - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
225 - fi
226 -
227 - systemd_reenable zfs-zed.service
228 - systemd_reenable zfs-import-cache.service
229 - systemd_reenable zfs-import-scan.service
230 - systemd_reenable zfs-mount.service
231 - systemd_reenable zfs-share.service
232 - systemd_reenable zfs-import.target
233 - systemd_reenable zfs.target
234 - systemd_reenable zfs.service
235 -
236 -}
237 -
238 -pkg_postrm() {
239 - if ! use kernel-builtin && [ ${PV} = "9999" ]
240 - then
241 - remove_moduledb
242 - fi
243 -}