1 |
commit: c296b5efa030747424a261b1cc27d0ee45d926ad |
2 |
Author: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 7 00:55:21 2017 +0000 |
4 |
Commit: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 7 00:56:17 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c296b5ef |
7 |
|
8 |
sys-fs/zfs: version bump to 0.6.5.9 |
9 |
|
10 |
- Bumped to ZFS on Linux 0.6.5.9 |
11 |
- Added additional maintainer: fearedbliss |
12 |
|
13 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
14 |
|
15 |
sys-fs/zfs/Manifest | 1 + |
16 |
sys-fs/zfs/metadata.xml | 4 + |
17 |
sys-fs/zfs/zfs-0.6.5.9.ebuild | 198 ++++++++++++++++++++++++++++++++++++++++++ |
18 |
3 files changed, 203 insertions(+) |
19 |
|
20 |
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest |
21 |
index e4ef850..abe782e 100644 |
22 |
--- a/sys-fs/zfs/Manifest |
23 |
+++ b/sys-fs/zfs/Manifest |
24 |
@@ -17,4 +17,5 @@ DIST zfs-0.6.5.4.tar.gz 2506470 SHA256 780862ec2301ccace412a324787e9df762cff6046 |
25 |
DIST zfs-0.6.5.6.tar.gz 2561093 SHA256 c349d46d86b4f61cd53a0891acad916cfc3f0d6754127db7f60a0bd98185aeff SHA512 94c55a50f0f9a90ce07a45dc72bb2730b2a41373ab5a12845df00ef38bb22e4a80ab2fb6e31a9c3a45e51516cdea441bb9da1d0acf71f2f88b38c7c3e9e995b0 WHIRLPOOL 6fcbe473bfce90f800989bac506fa6d4cf5662ad9ca617a477f1251c1625de906495a45759d6190e5a24dcf05f2ed3dd7ea1c0b2f243165a60e5efd098082935 |
26 |
DIST zfs-0.6.5.7.tar.gz 2537816 SHA256 4a9e271bb9a6af8d564e4d5800e4fff36224f1697b923a7253659bdda80dc590 SHA512 559b826ae1a176217b92d8407729e2c5feeffb117dc9affaa8c9c2134d996b6c3cbe095f7a0c4666c9b131742491f1304eeb292e13e0df0b6d001fa620568af2 WHIRLPOOL bf2e0865de35496cc995738ddde34df797b0c5047c0dd17e5b755803ef16e7c16f8ba89927106a1f6131c2f75a6749c31a72dff95fc0fee186b308c50ce0b4f4 |
27 |
DIST zfs-0.6.5.8.tar.gz 2521921 SHA256 d77f43f7dc38381773e2c34531954c52f3de80361b7bb10c933a7482f89cfe84 SHA512 e5b53a9531b865e7c650892c0deb1ee81db086a33538cd667a087a8a8d33a0ad93a30ae5e800096abfc4dc8ed00843da924230082e204fb7543dd401ef41fcde WHIRLPOOL 623bf8ee51d59dcd1842bf41ccf19c2eb6813fb1e88dea1ea1c6f1388c11484b798546bdcb94500735a0e9e5f9099a4df43308760b353b5b62ff56af035f88bd |
28 |
+DIST zfs-0.6.5.9.tar.gz 2610650 SHA256 b724b57dbddae59246fdc15f88f1224061c712945bb36412a2087e0c7760d77f SHA512 6e175f32421cf0f9e13429f12f0fac0564dc7059ab076831d0ebc4f6a17412160ca3526ebdf894bc7666e82580355b08701dd01c411d3177f82e7330b4529a37 WHIRLPOOL 149d730a26363b50691363b314669756d218c4a16e6d06e319c2b0866c5f8ed6e2da2396a516297c127d3343d51d78072d8b7371e3f4d327d30fa43c90be5cd3 |
29 |
DIST zfs-kmod-0.6.2-p4.tar.xz 63984 SHA256 9167edc4be86e3fcda6b3c198e51f92ab0c95ac5baca11666c28029a628cdac9 SHA512 13e4ec415c35d2f268d89565745f5898c0943423577a2ba6714b3a069c5a80f244cd06dff91464f38dd4ed60673d1145ead080bb03a56d4be33e328f948ffa64 WHIRLPOOL 8c399ec67119ed4fbebb5599d00f888918678bc4e4ea369b4bdc5c75bfc90fc76396087624c8011de370a54ff103bccaa8922d05ac7ccebb2b3481bbbcf44b19 |
30 |
|
31 |
diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml |
32 |
index e59a617..75b8633 100644 |
33 |
--- a/sys-fs/zfs/metadata.xml |
34 |
+++ b/sys-fs/zfs/metadata.xml |
35 |
@@ -5,6 +5,10 @@ |
36 |
<email>ryao@g.o</email> |
37 |
<name>Richard Yao</name> |
38 |
</maintainer> |
39 |
+ <maintainer type="person"> |
40 |
+ <email>fearedbliss@g.o</email> |
41 |
+ <name>Jonathan Vasquez</name> |
42 |
+ </maintainer> |
43 |
<use> |
44 |
<flag name="kernel-builtin">Disable dependency on sys-fs/zfs-kmod under the assumption that ZFS is part of the kernel source tree</flag> |
45 |
<flag name="rootfs">Enable dependencies required for booting off a pool containing a rootfs</flag> |
46 |
|
47 |
diff --git a/sys-fs/zfs/zfs-0.6.5.9.ebuild b/sys-fs/zfs/zfs-0.6.5.9.ebuild |
48 |
new file mode 100644 |
49 |
index 00000000..c1cb00a |
50 |
--- /dev/null |
51 |
+++ b/sys-fs/zfs/zfs-0.6.5.9.ebuild |
52 |
@@ -0,0 +1,198 @@ |
53 |
+# Copyright 1999-2017 Gentoo Foundation |
54 |
+# Distributed under the terms of the GNU General Public License v2 |
55 |
+# $Id$ |
56 |
+ |
57 |
+EAPI="5" |
58 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
59 |
+ |
60 |
+if [ ${PV} == "9999" ] ; then |
61 |
+ inherit git-r3 linux-mod |
62 |
+ AUTOTOOLS_AUTORECONF="1" |
63 |
+ EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" |
64 |
+else |
65 |
+ SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" |
66 |
+ KEYWORDS=" ~amd64" |
67 |
+fi |
68 |
+ |
69 |
+inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev |
70 |
+ |
71 |
+DESCRIPTION="Userland utilities for ZFS Linux kernel module" |
72 |
+HOMEPAGE="http://zfsonlinux.org/" |
73 |
+ |
74 |
+LICENSE="BSD-2 CDDL MIT" |
75 |
+SLOT="0" |
76 |
+IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" |
77 |
+RESTRICT="test" |
78 |
+ |
79 |
+COMMON_DEPEND=" |
80 |
+ sys-apps/util-linux[static-libs?] |
81 |
+ sys-libs/zlib[static-libs(+)?] |
82 |
+ virtual/awk |
83 |
+" |
84 |
+DEPEND="${COMMON_DEPEND} |
85 |
+ virtual/pkgconfig |
86 |
+" |
87 |
+ |
88 |
+RDEPEND="${COMMON_DEPEND} |
89 |
+ !=sys-apps/grep-2.13* |
90 |
+ !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) |
91 |
+ !sys-fs/zfs-fuse |
92 |
+ !prefix? ( virtual/udev ) |
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 |
+ rootfs? ( |
103 |
+ app-arch/cpio |
104 |
+ app-misc/pax-utils |
105 |
+ !<sys-boot/grub-2.00-r2:2 |
106 |
+ ) |
107 |
+ sys-fs/udev-init-scripts |
108 |
+" |
109 |
+ |
110 |
+AT_M4DIR="config" |
111 |
+AUTOTOOLS_IN_SOURCE_BUILD="1" |
112 |
+ |
113 |
+pkg_setup() { |
114 |
+ if use kernel_linux && use test-suite; then |
115 |
+ linux-info_pkg_setup |
116 |
+ if ! linux_config_exists; then |
117 |
+ ewarn "Cannot check the linux kernel configuration." |
118 |
+ else |
119 |
+ # recheck that we don't have usblp to collide with libusb |
120 |
+ if use test-suite; then |
121 |
+ if linux_chkconfig_present BLK_DEV_LOOP; then |
122 |
+ eerror "The ZFS test suite requires loop device support enabled." |
123 |
+ eerror "Please enable it:" |
124 |
+ eerror " CONFIG_BLK_DEV_LOOP=y" |
125 |
+ eerror "in /usr/src/linux/.config or" |
126 |
+ eerror " Device Drivers --->" |
127 |
+ eerror " Block devices --->" |
128 |
+ eerror " [ ] Loopback device support" |
129 |
+ fi |
130 |
+ fi |
131 |
+ fi |
132 |
+ fi |
133 |
+ |
134 |
+} |
135 |
+ |
136 |
+src_prepare() { |
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 |
142 |
+ |
143 |
+ autotools-utils_src_prepare |
144 |
+} |
145 |
+ |
146 |
+src_configure() { |
147 |
+ use custom-cflags || strip-flags |
148 |
+ local myeconfargs=( |
149 |
+ --bindir="${EPREFIX}/bin" |
150 |
+ --sbindir="${EPREFIX}/sbin" |
151 |
+ --with-config=user |
152 |
+ --with-dracutdir="/usr/$(get_libdir)/dracut" |
153 |
+ --with-linux="${KV_DIR}" |
154 |
+ --with-linux-obj="${KV_OUT_DIR}" |
155 |
+ --with-udevdir="$(get_udevdir)" |
156 |
+ --with-blkid |
157 |
+ $(use_enable debug) |
158 |
+ ) |
159 |
+ autotools-utils_src_configure |
160 |
+ |
161 |
+ # prepare systemd unit and helper script |
162 |
+ cat "${FILESDIR}/zfs.service.in" | \ |
163 |
+ sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ |
164 |
+ -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ |
165 |
+ > "${T}/zfs.service" || die |
166 |
+ cat "${FILESDIR}/zfs-init.sh.in" | \ |
167 |
+ sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ |
168 |
+ -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ |
169 |
+ > "${T}/zfs-init.sh" || die |
170 |
+} |
171 |
+ |
172 |
+src_install() { |
173 |
+ autotools-utils_src_install |
174 |
+ gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core |
175 |
+ use test-suite || rm -rf "${ED}usr/share/zfs" |
176 |
+ |
177 |
+ newbashcomp "${FILESDIR}/bash-completion-r1" zfs |
178 |
+ bashcomp_alias zfs zpool |
179 |
+ |
180 |
+ exeinto /usr/libexec |
181 |
+ doexe "${T}/zfs-init.sh" |
182 |
+ systemd_dounit "${T}/zfs.service" |
183 |
+} |
184 |
+ |
185 |
+pkg_postinst() { |
186 |
+ if ! use kernel-builtin && [ ${PV} = "9999" ] |
187 |
+ then |
188 |
+ einfo "Adding ${P} to the module database to ensure that the" |
189 |
+ einfo "kernel modules and userland utilities stay in sync." |
190 |
+ update_moduledb |
191 |
+ fi |
192 |
+ |
193 |
+ if [ -e "${EROOT}etc/runlevels/boot/zfs" ] |
194 |
+ then |
195 |
+ einfo 'The zfs boot script has been split into the zfs-import,' |
196 |
+ einfo 'zfs-mount and zfs-share scripts.' |
197 |
+ einfo |
198 |
+ einfo 'You had the zfs script in your boot runlevel. For your' |
199 |
+ einfo 'convenience, it has been automatically removed and the three' |
200 |
+ einfo 'scripts that replace it have been configured to start.' |
201 |
+ einfo 'The zfs-import and zfs-mount scripts have been added to the boot' |
202 |
+ einfo 'runlevel while the zfs-share script is in the default runlevel.' |
203 |
+ |
204 |
+ rm "${EROOT}etc/runlevels/boot/zfs" |
205 |
+ ln -snf "${EROOT}etc/init.d/zfs-import" \ |
206 |
+ "${EROOT}etc/runlevels/boot/zfs-import" |
207 |
+ ln -snf "${EROOT}etc/init.d/zfs-mount" \ |
208 |
+ "${EROOT}etc/runlevels/boot/zfs-mount" |
209 |
+ ln -snf "${EROOT}etc/init.d/zfs-share" \ |
210 |
+ "${EROOT}etc/runlevels/default/zfs-share" |
211 |
+ else |
212 |
+ [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ |
213 |
+ einfo "You should add zfs-import to the boot runlevel." |
214 |
+ [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ |
215 |
+ einfo "You should add zfs-mount to the boot runlevel." |
216 |
+ [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ |
217 |
+ einfo "You should add zfs-share to the default runlevel." |
218 |
+ fi |
219 |
+ |
220 |
+ if [ -e "${EROOT}etc/runlevels/default/zed" ] |
221 |
+ then |
222 |
+ einfo 'The downstream OpenRC zed script has replaced by the upstream' |
223 |
+ einfo 'OpenRC zfs-zed script.' |
224 |
+ einfo |
225 |
+ einfo 'You had the zed script in your default runlevel. For your' |
226 |
+ einfo 'convenience, it has been automatically removed and the zfs-zed' |
227 |
+ einfo 'script that replaced it has been configured to start.' |
228 |
+ |
229 |
+ rm "${EROOT}etc/runlevels/boot/zed" |
230 |
+ ln -snf "${EROOT}etc/init.d/zfs-sed" \ |
231 |
+ "${EROOT}etc/runlevels/default/zfs-zed" |
232 |
+ else |
233 |
+ [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ |
234 |
+ einfo "You should add zfs-zed to the default runlevel." |
235 |
+ fi |
236 |
+ |
237 |
+ if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] |
238 |
+ then |
239 |
+ einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." |
240 |
+ rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" |
241 |
+ fi |
242 |
+ |
243 |
+} |
244 |
+ |
245 |
+pkg_postrm() { |
246 |
+ if ! use kernel-builtin && [ ${PV} = "9999" ] |
247 |
+ then |
248 |
+ remove_moduledb |
249 |
+ fi |
250 |
+} |