1 |
commit: 99512534b681fa55dcee8191571b85e290c5bb4a |
2 |
Author: Richard Yao <ryao <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 27 22:04:57 2016 +0000 |
4 |
Commit: Richard Yao <ryao <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 27 22:04:57 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99512534 |
7 |
|
8 |
sys-fs/zfs-kmod-0.6.5.4{,-r1}: Version Bump |
9 |
|
10 |
The stable API patches from the 0.6.5.3-r4 ebuild and fix for the |
11 |
temporary pool names have been carried forward in 0.6.5.4-r1. 0.6.5.4 |
12 |
has been commited without any patches as an aid to users who do not want |
13 |
patches. However, it is left unkeyworded to ensure the upgrade path is |
14 |
smooth. |
15 |
|
16 |
Package-Manager: portage-2.2.24 |
17 |
Signed-off-by: Richard Yao <ryao <AT> gentoo.org> |
18 |
|
19 |
sys-fs/zfs-kmod/Manifest | 2 + |
20 |
sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild | 159 +++++++++++++++++++++++++++++ |
21 |
sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild | 145 ++++++++++++++++++++++++++ |
22 |
3 files changed, 306 insertions(+) |
23 |
|
24 |
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest |
25 |
index 9d35af1..744de10 100644 |
26 |
--- a/sys-fs/zfs-kmod/Manifest |
27 |
+++ b/sys-fs/zfs-kmod/Manifest |
28 |
@@ -8,5 +8,7 @@ DIST zfs-0.6.4.2.tar.gz 1738601 SHA256 26af2924cbb891b79203a31827cba4cdc310162d5 |
29 |
DIST zfs-0.6.5.2.tar.gz 1817267 SHA256 aecd2bc5189f2a71a45eb222230146bed231af4f35af5ec7af83a74987c3d595 SHA512 7f0b20feca91d5ab952c1d49ae94d241f8868825b163a3d5f2ad0fd7adcac3ab246a3e6a755019a833be553fbbfd6609828d8123f49a43b42bf76cfd64f234ec WHIRLPOOL 00fd628ef2267366b6f0705e6436ac55b260aabc3588c7f58a7042dfbfe95a0478740b4579326638d28f10ffc8f2d5b3ed21b9f8297e72344ec439fe30310634 |
30 |
DIST zfs-0.6.5.3-patches-p3.tar.xz 88736 SHA256 031cd97765f890d9b78e1a5746cbd2a3ce06c7208693ec75c0b47324ac67b97a SHA512 8f17cc6e02a35828a57a7c2a437d9d18a41203b6e3f9e154b2ab863296b64596dc827afeeb0f993e37f47881d0f2ed4834f270d0ba843ab84b21c491cc352576 WHIRLPOOL 20f69c0a936bb612d5e3b551d4bf904aca3aff6d885d72f67f3b14cd720094ec13e383032ee4e322b0e81017d8ffcfafb47bf07f273badef34f7210d687ddacc |
31 |
DIST zfs-0.6.5.3.tar.gz 2524218 SHA256 49e6f9760ea172cb756f7357e4bcb90ee0293028540a68d62ed087724276131f SHA512 325cb91b7ddbcd6aa0bb9fc41eb0099dbb047a4e32d096fd414799729ef68cbc9c2e15714092eff8044a681af4ab552bd9ac1949cc673c6c5c3de1a23d9895ec WHIRLPOOL 957c3a75bb11befd4b74583883f2f11f717deb6bda368939b342049e809aa191a9ee8d1e709eaddc2a831418c7fdb5e763f918ff56d45f03baf4569ef8a4a070 |
32 |
+DIST zfs-0.6.5.4-patches-p1.tar.xz 64004 SHA256 83877d9b7c629730838325fd5b16bcb54259520e200f0539de9b8edfdcee9403 SHA512 9203356b43bdad2ed78c946af8c95c9fc4d2996b41a09a3b1f5a8657d2742ac69d10b4a87d443db497d591878cf7a70ebb19762b0df135ee25f4e8d2ed6ad71f WHIRLPOOL ff5788356d6a85608d22ea2c010a799464922614204c7eea06b57930a44ee876e596a053a773205de0543d36c04337d60c32594939e8e64d3022906c51c4d4e6 |
33 |
+DIST zfs-0.6.5.4.tar.gz 2506470 SHA256 780862ec2301ccace412a324787e9df762cff6046e73e2ac0ebdce9e2bd59b0f SHA512 90c87cd95fd06cf34755358e7cc4053d19f351316133f0b808e7585a3fc8f82e7c0f49072c2995d0520de5104fd04d91a166a0d5b6c923c82dfb2fb4f7f57a01 WHIRLPOOL eacd2ec09afdbc3f6d946583116296fadcd7d0dea5158c89f82f6d0b02e0cbf075712015bfa5f321ae5815cf86af13b39ce93e5026e6a00da58d9ddb04d12320 |
34 |
DIST zfs-0.6.5.tar.gz 1816180 SHA256 542121940122c922c9d21a2bb39bca4e4a9db2f6bbfd2e576630840e256d4c82 SHA512 58480ee9b0780f1f21d12504abc226be3e6df1939214f6a8f245315d1fa0b9da56b3a744df26426ee78f13684a4ca288df6dddc50f8f91d9d0b4c542980a9c53 WHIRLPOOL fdb5580ec8d4abe57069ce453c1d91225019758ecf5d31856a7897ac7e4b51c6a8ae3258e822f684fbd70a0a7d7410c65c37a569f37d132767522118c587cc24 |
35 |
DIST zfs-kmod-0.6.2-p2.tar.xz 28636 SHA256 12882463a38a5a57cf2bb3c14c5783f9511f6dc7b163a47575f2f3dcc24f26f6 SHA512 5792660ae8f5013d12e70d608e9cffa92a8c4089a88a5e78728ee88204b3f970d452d5b0b3874e02be49ebbc139e07139be7b5a86ca40bc8b23cb11a7198a9a8 WHIRLPOOL 0e4c57b363cdd3d736efbd1355567b18e22439bd3b20ef40b27f6b97ad4570c7cc99a11b196ac25359d1966c1a70e178f4fd1687b60450f148ccda47b07282a9 |
36 |
|
37 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild |
38 |
new file mode 100644 |
39 |
index 0000000..7799ec6 |
40 |
--- /dev/null |
41 |
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild |
42 |
@@ -0,0 +1,159 @@ |
43 |
+# Copyright 1999-2015 Gentoo Foundation |
44 |
+# Distributed under the terms of the GNU General Public License v2 |
45 |
+# $Id$ |
46 |
+ |
47 |
+EAPI="5" |
48 |
+ |
49 |
+AT_M4DIR="config" |
50 |
+AUTOTOOLS_AUTORECONF="1" |
51 |
+AUTOTOOLS_IN_SOURCE_BUILD="1" |
52 |
+ |
53 |
+if [ ${PV} == "9999" ]; then |
54 |
+ AUTOTOOLS_AUTORECONF="1" |
55 |
+ EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" |
56 |
+ inherit git-r3 |
57 |
+else |
58 |
+ SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz |
59 |
+ https://dev.gentoo.org/~ryao/dist/zfs-${PV}-patches-p${PR#r}.tar.xz" |
60 |
+ S="${WORKDIR}/zfs-${PV}" |
61 |
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64" |
62 |
+fi |
63 |
+ |
64 |
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils |
65 |
+ |
66 |
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" |
67 |
+HOMEPAGE="http://zfsonlinux.org/" |
68 |
+ |
69 |
+LICENSE="CDDL debug? ( GPL-2+ )" |
70 |
+SLOT="0" |
71 |
+IUSE="custom-cflags debug +rootfs" |
72 |
+RESTRICT="debug? ( strip ) test" |
73 |
+ |
74 |
+DEPEND=" |
75 |
+ =sys-kernel/spl-${PV}* |
76 |
+ dev-lang/perl |
77 |
+ virtual/awk |
78 |
+" |
79 |
+ |
80 |
+RDEPEND="${DEPEND} |
81 |
+ !<sys-kernel/spl-0.6.5.3-r1 |
82 |
+ !sys-fs/zfs-fuse |
83 |
+" |
84 |
+ |
85 |
+AT_M4DIR="config" |
86 |
+AUTOTOOLS_IN_SOURCE_BUILD="1" |
87 |
+ |
88 |
+DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) |
89 |
+ |
90 |
+pkg_setup() { |
91 |
+ linux-info_pkg_setup |
92 |
+ CONFIG_CHECK="!DEBUG_LOCK_ALLOC |
93 |
+ EFI_PARTITION |
94 |
+ IOSCHED_NOOP |
95 |
+ MODULES |
96 |
+ !PAX_KERNEXEC_PLUGIN_METHOD_OR |
97 |
+ ZLIB_DEFLATE |
98 |
+ ZLIB_INFLATE |
99 |
+ " |
100 |
+ |
101 |
+ use debug && CONFIG_CHECK="${CONFIG_CHECK} |
102 |
+ FRAME_POINTER |
103 |
+ DEBUG_INFO |
104 |
+ !DEBUG_INFO_REDUCED |
105 |
+ " |
106 |
+ |
107 |
+ use rootfs && \ |
108 |
+ CONFIG_CHECK="${CONFIG_CHECK} |
109 |
+ BLK_DEV_INITRD |
110 |
+ DEVTMPFS |
111 |
+ " |
112 |
+ |
113 |
+ kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
114 |
+ |
115 |
+ [ ${PV} != "9999" ] && \ |
116 |
+ { kernel_is le 4 4 || die "Linux 4.4 is the latest supported version."; } |
117 |
+ |
118 |
+ check_extra_config |
119 |
+} |
120 |
+ |
121 |
+src_prepare() { |
122 |
+ if [ ${PV} != "9999" ] |
123 |
+ then |
124 |
+ # Apply patch set |
125 |
+ EPATCH_SUFFIX="patch" \ |
126 |
+ EPATCH_FORCE="yes" \ |
127 |
+ epatch "${WORKDIR}/zfs-${PV}-patches" |
128 |
+ fi |
129 |
+ |
130 |
+ # Remove GPLv2-licensed ZPIOS unless we are debugging |
131 |
+ use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" |
132 |
+ |
133 |
+ # Set module revision number |
134 |
+ [ ${PV} != "9999" ] && \ |
135 |
+ { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } |
136 |
+ |
137 |
+ autotools-utils_src_prepare |
138 |
+} |
139 |
+ |
140 |
+src_configure() { |
141 |
+ local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" |
142 |
+ use custom-cflags || strip-flags |
143 |
+ filter-ldflags -Wl,* |
144 |
+ |
145 |
+ set_arch_to_kernel |
146 |
+ local myeconfargs=(${myeconfargs} |
147 |
+ --bindir="${EPREFIX}/bin" |
148 |
+ --sbindir="${EPREFIX}/sbin" |
149 |
+ --with-config=kernel |
150 |
+ --with-linux="${KV_DIR}" |
151 |
+ --with-linux-obj="${KV_OUT_DIR}" |
152 |
+ --with-spl="${EROOT}usr/src/${SPL_PATH}" |
153 |
+ --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" |
154 |
+ $(use_enable debug) |
155 |
+ ) |
156 |
+ |
157 |
+ autotools-utils_src_configure |
158 |
+} |
159 |
+ |
160 |
+src_install() { |
161 |
+ autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" |
162 |
+} |
163 |
+ |
164 |
+pkg_postinst() { |
165 |
+ linux-mod_pkg_postinst |
166 |
+ |
167 |
+ # Remove old modules |
168 |
+ if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] |
169 |
+ then |
170 |
+ ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" |
171 |
+ ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" |
172 |
+ ewarn "Automatically removing old modules to avoid problems." |
173 |
+ rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" |
174 |
+ rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
175 |
+ fi |
176 |
+ |
177 |
+ if use x86 || use arm |
178 |
+ then |
179 |
+ ewarn "32-bit kernels will likely require increasing vmalloc to" |
180 |
+ ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |
181 |
+ fi |
182 |
+ |
183 |
+ ewarn "This version of ZFSOnLinux includes support for new feature flags" |
184 |
+ ewarn "that are incompatible with previous versions. GRUB2 support for" |
185 |
+ ewarn "/boot with the new feature flags is not yet available." |
186 |
+ ewarn "Do *NOT* upgrade root pools to use the new feature flags." |
187 |
+ ewarn "Any new pools will be created with the new feature flags by default" |
188 |
+ ewarn "and will not be compatible with older versions of ZFSOnLinux. To" |
189 |
+ ewarn "create a newpool that is backward compatible wih GRUB2, use " |
190 |
+ ewarn |
191 |
+ ewarn "zpool create -d -o feature@async_destroy=enabled " |
192 |
+ ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" |
193 |
+ ewarn " -o feature@spacemap_histogram=enabled" |
194 |
+ ewarn " -o feature@enabled_txg=enabled " |
195 |
+ ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" |
196 |
+ ewarn " ..." |
197 |
+ ewarn |
198 |
+ ewarn "GRUB2 support will be updated as soon as either the GRUB2" |
199 |
+ ewarn "developers do a tag or the Gentoo developers find time to backport" |
200 |
+ ewarn "support from GRUB2 HEAD." |
201 |
+} |
202 |
|
203 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild |
204 |
new file mode 100644 |
205 |
index 0000000..e7b2197 |
206 |
--- /dev/null |
207 |
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild |
208 |
@@ -0,0 +1,145 @@ |
209 |
+# Copyright 1999-2015 Gentoo Foundation |
210 |
+# Distributed under the terms of the GNU General Public License v2 |
211 |
+# $Id$ |
212 |
+ |
213 |
+EAPI="5" |
214 |
+ |
215 |
+if [ ${PV} == "9999" ]; then |
216 |
+ AUTOTOOLS_AUTORECONF="1" |
217 |
+ EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" |
218 |
+ inherit git-r3 |
219 |
+else |
220 |
+ SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" |
221 |
+ S="${WORKDIR}/zfs-${PV}" |
222 |
+ KEYWORDS="" |
223 |
+fi |
224 |
+ |
225 |
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils |
226 |
+ |
227 |
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" |
228 |
+HOMEPAGE="http://zfsonlinux.org/" |
229 |
+ |
230 |
+LICENSE="CDDL debug? ( GPL-2+ )" |
231 |
+SLOT="0" |
232 |
+IUSE="custom-cflags debug +rootfs" |
233 |
+RESTRICT="debug? ( strip ) test" |
234 |
+ |
235 |
+DEPEND=" |
236 |
+ =sys-kernel/spl-${PV}* |
237 |
+ dev-lang/perl |
238 |
+ virtual/awk |
239 |
+" |
240 |
+ |
241 |
+RDEPEND="${DEPEND} |
242 |
+ !sys-fs/zfs-fuse |
243 |
+" |
244 |
+ |
245 |
+AT_M4DIR="config" |
246 |
+AUTOTOOLS_IN_SOURCE_BUILD="1" |
247 |
+ |
248 |
+DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) |
249 |
+ |
250 |
+pkg_setup() { |
251 |
+ linux-info_pkg_setup |
252 |
+ CONFIG_CHECK="!DEBUG_LOCK_ALLOC |
253 |
+ EFI_PARTITION |
254 |
+ IOSCHED_NOOP |
255 |
+ MODULES |
256 |
+ !PAX_KERNEXEC_PLUGIN_METHOD_OR |
257 |
+ ZLIB_DEFLATE |
258 |
+ ZLIB_INFLATE |
259 |
+ " |
260 |
+ |
261 |
+ use debug && CONFIG_CHECK="${CONFIG_CHECK} |
262 |
+ FRAME_POINTER |
263 |
+ DEBUG_INFO |
264 |
+ !DEBUG_INFO_REDUCED |
265 |
+ " |
266 |
+ |
267 |
+ use rootfs && \ |
268 |
+ CONFIG_CHECK="${CONFIG_CHECK} |
269 |
+ BLK_DEV_INITRD |
270 |
+ DEVTMPFS |
271 |
+ " |
272 |
+ |
273 |
+ kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
274 |
+ |
275 |
+ [ ${PV} != "9999" ] && \ |
276 |
+ { kernel_is le 4 3 || die "Linux 4.3 is the latest supported version."; } |
277 |
+ |
278 |
+ check_extra_config |
279 |
+} |
280 |
+ |
281 |
+src_prepare() { |
282 |
+ # Remove GPLv2-licensed ZPIOS unless we are debugging |
283 |
+ use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" |
284 |
+ |
285 |
+ # Set module revision number |
286 |
+ [ ${PV} != "9999" ] && \ |
287 |
+ { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } |
288 |
+ |
289 |
+ autotools-utils_src_prepare |
290 |
+} |
291 |
+ |
292 |
+src_configure() { |
293 |
+ local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" |
294 |
+ use custom-cflags || strip-flags |
295 |
+ filter-ldflags -Wl,* |
296 |
+ |
297 |
+ set_arch_to_kernel |
298 |
+ local myeconfargs=(${myeconfargs} |
299 |
+ --bindir="${EPREFIX}/bin" |
300 |
+ --sbindir="${EPREFIX}/sbin" |
301 |
+ --with-config=kernel |
302 |
+ --with-linux="${KV_DIR}" |
303 |
+ --with-linux-obj="${KV_OUT_DIR}" |
304 |
+ --with-spl="${EROOT}usr/src/${SPL_PATH}" |
305 |
+ --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" |
306 |
+ $(use_enable debug) |
307 |
+ ) |
308 |
+ |
309 |
+ autotools-utils_src_configure |
310 |
+} |
311 |
+ |
312 |
+src_install() { |
313 |
+ autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" |
314 |
+} |
315 |
+ |
316 |
+pkg_postinst() { |
317 |
+ linux-mod_pkg_postinst |
318 |
+ |
319 |
+ # Remove old modules |
320 |
+ if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ] |
321 |
+ then |
322 |
+ ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs" |
323 |
+ ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs" |
324 |
+ ewarn "Automatically removing old modules to avoid problems." |
325 |
+ rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" |
326 |
+ rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
327 |
+ fi |
328 |
+ |
329 |
+ if use x86 || use arm |
330 |
+ then |
331 |
+ ewarn "32-bit kernels will likely require increasing vmalloc to" |
332 |
+ ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |
333 |
+ fi |
334 |
+ |
335 |
+ ewarn "This version of ZFSOnLinux includes support for new feature flags" |
336 |
+ ewarn "that are incompatible with previous versions. GRUB2 support for" |
337 |
+ ewarn "/boot with the new feature flags is not yet available." |
338 |
+ ewarn "Do *NOT* upgrade root pools to use the new feature flags." |
339 |
+ ewarn "Any new pools will be created with the new feature flags by default" |
340 |
+ ewarn "and will not be compatible with older versions of ZFSOnLinux. To" |
341 |
+ ewarn "create a newpool that is backward compatible wih GRUB2, use " |
342 |
+ ewarn |
343 |
+ ewarn "zpool create -d -o feature@async_destroy=enabled " |
344 |
+ ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" |
345 |
+ ewarn " -o feature@spacemap_histogram=enabled" |
346 |
+ ewarn " -o feature@enabled_txg=enabled " |
347 |
+ ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" |
348 |
+ ewarn " ..." |
349 |
+ ewarn |
350 |
+ ewarn "GRUB2 support will be updated as soon as either the GRUB2" |
351 |
+ ewarn "developers do a tag or the Gentoo developers find time to backport" |
352 |
+ ewarn "support from GRUB2 HEAD." |
353 |
+} |