1 |
ryao 14/12/01 07:04:45 |
2 |
|
3 |
Modified: zfs-9999.ebuild ChangeLog |
4 |
Added: zfs-0.6.3-r1.ebuild |
5 |
Log: |
6 |
Numerous backports from HEAD: Send/recv reliability/performance fixes, ZED fixes, systemd compatibility fixes, dracut support, memory leak (userland tools) fixes, drive database update, a pkgconfig file and many more. |
7 |
|
8 |
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.56 sys-fs/zfs/zfs-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.56&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.56&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?r1=1.55&r2=1.56 |
16 |
|
17 |
Index: zfs-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v |
20 |
retrieving revision 1.55 |
21 |
retrieving revision 1.56 |
22 |
diff -u -r1.55 -r1.56 |
23 |
--- zfs-9999.ebuild 1 Dec 2014 05:26:19 -0000 1.55 |
24 |
+++ zfs-9999.ebuild 1 Dec 2014 07:04:45 -0000 1.56 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2014 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.55 2014/12/01 05:26:19 ryao Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.56 2014/12/01 07:04:45 ryao Exp $ |
30 |
|
31 |
EAPI="5" |
32 |
PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3,3_4} ) |
33 |
@@ -91,6 +91,7 @@ |
34 |
--bindir="${EPREFIX}/bin" |
35 |
--sbindir="${EPREFIX}/sbin" |
36 |
--with-config=user |
37 |
+ --with-dracutdir="/usr$(get_libdir)/dracut" |
38 |
--with-linux="${KV_DIR}" |
39 |
--with-linux-obj="${KV_OUT_DIR}" |
40 |
--with-udevdir="$(get_udevdir)" |
41 |
@@ -113,7 +114,6 @@ |
42 |
src_install() { |
43 |
autotools-utils_src_install |
44 |
gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core |
45 |
- rm -rf "${ED}usr/lib/dracut" |
46 |
use test-suite || rm -rf "${ED}usr/share/zfs" |
47 |
|
48 |
use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs |
49 |
|
50 |
|
51 |
|
52 |
1.87 sys-fs/zfs/ChangeLog |
53 |
|
54 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.87&view=markup |
55 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.87&content-type=text/plain |
56 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?r1=1.86&r2=1.87 |
57 |
|
58 |
Index: ChangeLog |
59 |
=================================================================== |
60 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v |
61 |
retrieving revision 1.86 |
62 |
retrieving revision 1.87 |
63 |
diff -u -r1.86 -r1.87 |
64 |
--- ChangeLog 1 Dec 2014 05:26:19 -0000 1.86 |
65 |
+++ ChangeLog 1 Dec 2014 07:04:45 -0000 1.87 |
66 |
@@ -1,6 +1,14 @@ |
67 |
# ChangeLog for sys-fs/zfs |
68 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
69 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.86 2014/12/01 05:26:19 ryao Exp $ |
70 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.87 2014/12/01 07:04:45 ryao Exp $ |
71 |
+ |
72 |
+*zfs-0.6.3-r1 (01 Dec 2014) |
73 |
+ |
74 |
+ 01 Dec 2014; Richard Yao <ryao@g.o> +zfs-0.6.3-r1.ebuild, |
75 |
+ zfs-9999.ebuild: |
76 |
+ Numerous backports from HEAD: Send/recv reliability/performance fixes, ZED |
77 |
+ fixes, systemd compatibility fixes, dracut support, memory leak (userland |
78 |
+ tools) fixes, drive database update, a pkgconfig file and many more. |
79 |
|
80 |
01 Dec 2014; Richard Yao <ryao@g.o> zfs-0.6.2-r3.ebuild, |
81 |
zfs-0.6.2-r4.ebuild, zfs-0.6.2-r5.ebuild, zfs-0.6.3.ebuild, zfs-9999.ebuild: |
82 |
|
83 |
|
84 |
|
85 |
1.1 sys-fs/zfs/zfs-0.6.3-r1.ebuild |
86 |
|
87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.3-r1.ebuild?rev=1.1&view=markup |
88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.3-r1.ebuild?rev=1.1&content-type=text/plain |
89 |
|
90 |
Index: zfs-0.6.3-r1.ebuild |
91 |
=================================================================== |
92 |
# Copyright 1999-2014 Gentoo Foundation |
93 |
# Distributed under the terms of the GNU General Public License v2 |
94 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.3-r1.ebuild,v 1.1 2014/12/01 07:04:45 ryao Exp $ |
95 |
|
96 |
EAPI="5" |
97 |
PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3,3_4} ) |
98 |
|
99 |
inherit python-r1 |
100 |
|
101 |
AT_M4DIR="config" |
102 |
AUTOTOOLS_AUTORECONF="1" |
103 |
AUTOTOOLS_IN_SOURCE_BUILD="1" |
104 |
|
105 |
if [ ${PV} == "9999" ] ; then |
106 |
inherit git-2 linux-mod |
107 |
EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" |
108 |
else |
109 |
inherit eutils versionator |
110 |
SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz |
111 |
http://dev.gentoo.org/~ryao/dist/${P}-patches-${PR}.tar.xz" |
112 |
S="${WORKDIR}/${PN}-${P}" |
113 |
KEYWORDS="~amd64" |
114 |
fi |
115 |
|
116 |
inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd |
117 |
|
118 |
DESCRIPTION="Userland utilities for ZFS Linux kernel module" |
119 |
HOMEPAGE="http://zfsonlinux.org/" |
120 |
|
121 |
LICENSE="BSD-2 CDDL bash-completion? ( MIT )" |
122 |
SLOT="0" |
123 |
IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs test-suite static-libs" |
124 |
RESTRICT="test" |
125 |
|
126 |
COMMON_DEPEND=" |
127 |
sys-apps/util-linux[static-libs?] |
128 |
sys-libs/zlib[static-libs(+)?] |
129 |
virtual/awk |
130 |
" |
131 |
DEPEND="${COMMON_DEPEND} |
132 |
virtual/pkgconfig |
133 |
" |
134 |
|
135 |
RDEPEND="${COMMON_DEPEND} |
136 |
!=sys-apps/grep-2.13* |
137 |
!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) |
138 |
!sys-fs/zfs-fuse |
139 |
!prefix? ( virtual/udev ) |
140 |
test-suite? ( |
141 |
sys-apps/util-linux |
142 |
sys-devel/bc |
143 |
sys-block/parted |
144 |
sys-fs/lsscsi |
145 |
sys-fs/mdadm |
146 |
sys-process/procps |
147 |
virtual/modutils |
148 |
) |
149 |
rootfs? ( |
150 |
app-arch/cpio |
151 |
app-misc/pax-utils |
152 |
!<sys-boot/grub-2.00-r2:2 |
153 |
) |
154 |
" |
155 |
|
156 |
pkg_setup() { |
157 |
: |
158 |
} |
159 |
|
160 |
src_prepare() { |
161 |
if [ ${PV} != "9999" ] |
162 |
then |
163 |
# Apply patch set |
164 |
EPATCH_SUFFIX="patch" \ |
165 |
EPATCH_FORCE="yes" \ |
166 |
epatch "${WORKDIR}/${P}-patches" |
167 |
fi |
168 |
|
169 |
# Update paths |
170 |
sed -e "s|/sbin/lsmod|/bin/lsmod|" \ |
171 |
-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ |
172 |
-e "s|/sbin/parted|/usr/sbin/parted|" \ |
173 |
-i scripts/common.sh.in |
174 |
|
175 |
autotools-utils_src_prepare |
176 |
} |
177 |
|
178 |
src_configure() { |
179 |
use custom-cflags || strip-flags |
180 |
local myeconfargs=( |
181 |
--bindir="${EPREFIX}/bin" |
182 |
--sbindir="${EPREFIX}/sbin" |
183 |
--with-config=user |
184 |
--with-dracutdir="/usr$(get_libdir)/dracut" |
185 |
--with-linux="${KV_DIR}" |
186 |
--with-linux-obj="${KV_OUT_DIR}" |
187 |
--with-udevdir="$(get_udevdir)" |
188 |
--with-blkid |
189 |
$(use_enable debug) |
190 |
) |
191 |
autotools-utils_src_configure |
192 |
|
193 |
# prepare systemd unit and helper script |
194 |
cat "${FILESDIR}/zfs.service.in" | \ |
195 |
sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ |
196 |
-e "s:@sysconfdir@:${EPREFIX}/etc:g" \ |
197 |
> "${T}/zfs.service" || die |
198 |
cat "${FILESDIR}/zfs-init.sh.in" | \ |
199 |
sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ |
200 |
-e "s:@sysconfdir@:${EPREFIX}/etc:g" \ |
201 |
> "${T}/zfs-init.sh" || die |
202 |
} |
203 |
|
204 |
src_install() { |
205 |
autotools-utils_src_install |
206 |
gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core |
207 |
use test-suite || rm -rf "${ED}usr/share/zfs" |
208 |
|
209 |
use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs |
210 |
|
211 |
exeinto /usr/libexec |
212 |
doexe "${T}/zfs-init.sh" |
213 |
systemd_dounit "${T}/zfs.service" |
214 |
} |
215 |
|
216 |
pkg_postinst() { |
217 |
|
218 |
if ! use kernel-builtin && [ ${PV} = "9999" ] |
219 |
then |
220 |
einfo "Adding ${P} to the module database to ensure that the" |
221 |
einfo "kernel modules and userland utilities stay in sync." |
222 |
update_moduledb |
223 |
fi |
224 |
|
225 |
[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ |
226 |
|| ewarn 'You should add zfs to the boot runlevel.' |
227 |
|
228 |
if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] |
229 |
then |
230 |
einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." |
231 |
rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" |
232 |
fi |
233 |
|
234 |
} |
235 |
|
236 |
pkg_postrm() { |
237 |
if ! use kernel-builtin && [ ${PV} = "9999" ] |
238 |
then |
239 |
remove_moduledb |
240 |
fi |
241 |
} |