1 |
ryao 13/11/21 15:47:44 |
2 |
|
3 |
Modified: zfs-kmod-9999.ebuild ChangeLog |
4 |
Added: zfs-kmod-0.6.2-r3.ebuild |
5 |
Removed: zfs-kmod-0.6.2-r2.ebuild zfs-kmod-0.6.2.ebuild |
6 |
zfs-kmod-0.6.2-r1.ebuild |
7 |
Log: |
8 |
Fix writeback regression introduced in -r2 that affected mmap() and AIO writes; Apply locking fixes from Illumos; Reintroduce uio_prefaultpages() to minimize the possibility of hitting zfsonlinux/zfs#1689; Add Linux 3.12 Support |
9 |
|
10 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64) |
11 |
|
12 |
Revision Changes Path |
13 |
1.18 sys-fs/zfs-kmod/zfs-kmod-9999.ebuild |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?rev=1.18&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?rev=1.18&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?r1=1.17&r2=1.18 |
18 |
|
19 |
Index: zfs-kmod-9999.ebuild |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v |
22 |
retrieving revision 1.17 |
23 |
retrieving revision 1.18 |
24 |
diff -u -r1.17 -r1.18 |
25 |
--- zfs-kmod-9999.ebuild 17 Apr 2013 14:30:18 -0000 1.17 |
26 |
+++ zfs-kmod-9999.ebuild 21 Nov 2013 15:47:44 -0000 1.18 |
27 |
@@ -1,6 +1,6 @@ |
28 |
# Copyright 1999-2013 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.17 2013/04/17 14:30:18 ryao Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.18 2013/11/21 15:47:44 ryao Exp $ |
32 |
|
33 |
EAPI="4" |
34 |
|
35 |
@@ -17,7 +17,8 @@ |
36 |
else |
37 |
inherit eutils versionator |
38 |
MY_PV=$(replace_version_separator 3 '-') |
39 |
- SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz" |
40 |
+ SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz |
41 |
+ http://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p2.tar.xz" |
42 |
S="${WORKDIR}/zfs-zfs-${MY_PV}" |
43 |
KEYWORDS="~amd64" |
44 |
fi |
45 |
@@ -59,7 +60,7 @@ |
46 |
kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" |
47 |
|
48 |
[ ${PV} != "9999" ] && \ |
49 |
- { kernel_is le 3 9 || die "Linux 3.9 is the latest supported version."; } |
50 |
+ { kernel_is le 3 12 || die "Linux 3.12 is the latest supported version."; } |
51 |
|
52 |
check_extra_config |
53 |
} |
54 |
@@ -68,6 +69,14 @@ |
55 |
# Remove GPLv2-licensed ZPIOS unless we are debugging |
56 |
use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" |
57 |
|
58 |
+ if [ ${PV} != "9999" ] |
59 |
+ then |
60 |
+ # Apply patch set |
61 |
+ EPATCH_SUFFIX="patch" \ |
62 |
+ EPATCH_FORCE="yes" \ |
63 |
+ epatch "${WORKDIR}/${PN}-${MY_PV}-patches" |
64 |
+ fi |
65 |
+ |
66 |
autotools-utils_src_prepare |
67 |
} |
68 |
|
69 |
|
70 |
|
71 |
|
72 |
1.40 sys-fs/zfs-kmod/ChangeLog |
73 |
|
74 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?rev=1.40&view=markup |
75 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?rev=1.40&content-type=text/plain |
76 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?r1=1.39&r2=1.40 |
77 |
|
78 |
Index: ChangeLog |
79 |
=================================================================== |
80 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v |
81 |
retrieving revision 1.39 |
82 |
retrieving revision 1.40 |
83 |
diff -u -r1.39 -r1.40 |
84 |
--- ChangeLog 18 Oct 2013 16:25:53 -0000 1.39 |
85 |
+++ ChangeLog 21 Nov 2013 15:47:44 -0000 1.40 |
86 |
@@ -1,6 +1,16 @@ |
87 |
# ChangeLog for sys-fs/zfs-kmod |
88 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
89 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.39 2013/10/18 16:25:53 ryao Exp $ |
90 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.40 2013/11/21 15:47:44 ryao Exp $ |
91 |
+ |
92 |
+*zfs-kmod-0.6.2-r3 (21 Nov 2013) |
93 |
+ |
94 |
+ 21 Nov 2013; Richard Yao <ryao@g.o> +zfs-kmod-0.6.2-r3.ebuild, |
95 |
+ -zfs-kmod-0.6.2-r1.ebuild, -zfs-kmod-0.6.2-r2.ebuild, -zfs-kmod-0.6.2.ebuild, |
96 |
+ zfs-kmod-9999.ebuild: |
97 |
+ Fix writeback regression introduced in -r2 that affected mmap() and AIO |
98 |
+ writes; Apply locking fixes from Illumos; Reintroduce uio_prefaultpages() to |
99 |
+ minimize the possibility of hitting zfsonlinux/zfs#1689; Add Linux 3.12 |
100 |
+ Support |
101 |
|
102 |
*zfs-kmod-0.6.2-r2 (18 Oct 2013) |
103 |
|
104 |
|
105 |
|
106 |
|
107 |
1.1 sys-fs/zfs-kmod/zfs-kmod-0.6.2-r3.ebuild |
108 |
|
109 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r3.ebuild?rev=1.1&view=markup |
110 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r3.ebuild?rev=1.1&content-type=text/plain |
111 |
|
112 |
Index: zfs-kmod-0.6.2-r3.ebuild |
113 |
=================================================================== |
114 |
# Copyright 1999-2013 Gentoo Foundation |
115 |
# Distributed under the terms of the GNU General Public License v2 |
116 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.2-r3.ebuild,v 1.1 2013/11/21 15:47:44 ryao Exp $ |
117 |
|
118 |
EAPI="4" |
119 |
|
120 |
AT_M4DIR="config" |
121 |
AUTOTOOLS_AUTORECONF="1" |
122 |
AUTOTOOLS_IN_SOURCE_BUILD="1" |
123 |
|
124 |
inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils |
125 |
|
126 |
if [ ${PV} == "9999" ] ; then |
127 |
inherit git-2 |
128 |
MY_PV=9999 |
129 |
EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git" |
130 |
else |
131 |
inherit eutils versionator |
132 |
MY_PV=$(replace_version_separator 3 '-') |
133 |
SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz |
134 |
http://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p2.tar.xz" |
135 |
S="${WORKDIR}/zfs-zfs-${MY_PV}" |
136 |
KEYWORDS="~amd64" |
137 |
fi |
138 |
|
139 |
DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" |
140 |
HOMEPAGE="http://zfsonlinux.org/" |
141 |
|
142 |
LICENSE="CDDL debug? ( GPL-2+ )" |
143 |
SLOT="0" |
144 |
IUSE="custom-cflags debug +rootfs" |
145 |
RESTRICT="test" |
146 |
|
147 |
DEPEND=" |
148 |
=sys-kernel/spl-${PV}* |
149 |
dev-lang/perl |
150 |
virtual/awk |
151 |
" |
152 |
|
153 |
RDEPEND="${DEPEND} |
154 |
!sys-fs/zfs-fuse |
155 |
" |
156 |
|
157 |
pkg_setup() { |
158 |
linux-info_pkg_setup |
159 |
CONFIG_CHECK="!DEBUG_LOCK_ALLOC |
160 |
BLK_DEV_LOOP |
161 |
EFI_PARTITION |
162 |
IOSCHED_NOOP |
163 |
MODULES |
164 |
!PAX_KERNEXEC_PLUGIN_METHOD_OR |
165 |
ZLIB_DEFLATE |
166 |
ZLIB_INFLATE |
167 |
" |
168 |
|
169 |
use rootfs && \ |
170 |
CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD |
171 |
DEVTMPFS" |
172 |
|
173 |
kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" |
174 |
|
175 |
[ ${PV} != "9999" ] && \ |
176 |
{ kernel_is le 3 12 || die "Linux 3.12 is the latest supported version."; } |
177 |
|
178 |
check_extra_config |
179 |
} |
180 |
|
181 |
src_prepare() { |
182 |
# Remove GPLv2-licensed ZPIOS unless we are debugging |
183 |
use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" |
184 |
|
185 |
if [ ${PV} != "9999" ] |
186 |
then |
187 |
# Apply patch set |
188 |
EPATCH_SUFFIX="patch" \ |
189 |
EPATCH_FORCE="yes" \ |
190 |
epatch "${WORKDIR}/${PN}-${MY_PV}-patches" |
191 |
fi |
192 |
|
193 |
autotools-utils_src_prepare |
194 |
} |
195 |
|
196 |
src_configure() { |
197 |
use custom-cflags || strip-flags |
198 |
filter-ldflags -Wl,* |
199 |
|
200 |
set_arch_to_kernel |
201 |
local myeconfargs=( |
202 |
--bindir="${EPREFIX}/bin" |
203 |
--sbindir="${EPREFIX}/sbin" |
204 |
--with-config=kernel |
205 |
--with-linux="${KV_DIR}" |
206 |
--with-linux-obj="${KV_OUT_DIR}" |
207 |
$(use_enable debug) |
208 |
) |
209 |
autotools-utils_src_configure |
210 |
} |
211 |
|
212 |
src_install() { |
213 |
autotools-utils_src_install |
214 |
dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown |
215 |
} |
216 |
|
217 |
pkg_postinst() { |
218 |
linux-mod_pkg_postinst |
219 |
|
220 |
# Remove old modules |
221 |
if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] |
222 |
then |
223 |
ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" |
224 |
ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" |
225 |
ewarn "Automatically removing old modules to avoid problems." |
226 |
rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" |
227 |
rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
228 |
fi |
229 |
|
230 |
if use x86 || use arm |
231 |
then |
232 |
ewarn "32-bit kernels will likely require increasing vmalloc to" |
233 |
ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |
234 |
fi |
235 |
|
236 |
ewarn "This version of ZFSOnLinux includes support for features flags." |
237 |
ewarn "If you upgrade your pools to make use of feature flags, you will lose" |
238 |
ewarn "the ability to import them using older versions of ZFSOnLinux." |
239 |
ewarn "Any new pools will be created with feature flag support and will" |
240 |
ewarn "not be compatible with older versions of ZFSOnLinux. To create a new" |
241 |
ewarn "pool that is backward compatible, use zpool create -o version=28 ..." |
242 |
} |