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