1 |
commit: 3793c997a2091476b33ad8a65ac1011676752dac |
2 |
Author: Richard Yao <ryao <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 31 15:05:26 2018 +0000 |
4 |
Commit: Richard Yao <ryao <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 31 15:05:26 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3793c997 |
7 |
|
8 |
sys-fs/zfs-kmod-9999: Fix build failures |
9 |
|
10 |
Merging the SPL into the upstream repository required changes to the |
11 |
ebuild. |
12 |
|
13 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
14 |
|
15 |
sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 43 ++++++++---------------------------- |
16 |
1 file changed, 9 insertions(+), 34 deletions(-) |
17 |
|
18 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild |
19 |
index 1b30e443205..ad612dbbc60 100644 |
20 |
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild |
21 |
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild |
22 |
@@ -18,35 +18,38 @@ inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils |
23 |
DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" |
24 |
HOMEPAGE="http://zfsonlinux.org/" |
25 |
|
26 |
-LICENSE="CDDL debug? ( GPL-2+ )" |
27 |
+LICENSE="CDDL GPL-2+" |
28 |
SLOT="0" |
29 |
IUSE="custom-cflags debug +rootfs" |
30 |
RESTRICT="debug? ( strip ) test" |
31 |
|
32 |
DEPEND=" |
33 |
- =sys-kernel/spl-${PV}* |
34 |
dev-lang/perl |
35 |
virtual/awk |
36 |
" |
37 |
|
38 |
RDEPEND="${DEPEND} |
39 |
!sys-fs/zfs-fuse |
40 |
+ !sys-kernel/spl |
41 |
" |
42 |
|
43 |
AT_M4DIR="config" |
44 |
AUTOTOOLS_IN_SOURCE_BUILD="1" |
45 |
|
46 |
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) |
47 |
+DOCS=( AUTHORS COPYRIGHT NOTICE META README.md ) |
48 |
|
49 |
pkg_setup() { |
50 |
linux-info_pkg_setup |
51 |
CONFIG_CHECK=" |
52 |
- !DEBUG_LOCK_ALLOC |
53 |
!CONFIG_REISER4_FS |
54 |
+ !DEBUG_LOCK_ALLOC |
55 |
+ !GRKERNSEC_RANDSTRUCT |
56 |
+ !PAX_KERNEXEC_PLUGIN_METHOD_OR |
57 |
+ !TRIM_UNUSED_KSYMS |
58 |
EFI_PARTITION |
59 |
IOSCHED_NOOP |
60 |
+ KALLSYMS |
61 |
MODULES |
62 |
- !PAX_KERNEXEC_PLUGIN_METHOD_OR |
63 |
ZLIB_DEFLATE |
64 |
ZLIB_INFLATE |
65 |
" |
66 |
@@ -66,7 +69,7 @@ pkg_setup() { |
67 |
kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
68 |
|
69 |
[ ${PV} != "9999" ] && \ |
70 |
- { kernel_is le 4 13 || die "Linux 4.13 is the latest supported version."; } |
71 |
+ { kernel_is le 4 16 || die "Linux 4.16 is the latest supported version."; } |
72 |
|
73 |
check_extra_config |
74 |
} |
75 |
@@ -83,7 +86,6 @@ src_prepare() { |
76 |
} |
77 |
|
78 |
src_configure() { |
79 |
- local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" |
80 |
use custom-cflags || strip-flags |
81 |
filter-ldflags -Wl,* |
82 |
|
83 |
@@ -94,8 +96,6 @@ src_configure() { |
84 |
--with-config=kernel |
85 |
--with-linux="${KV_DIR}" |
86 |
--with-linux-obj="${KV_OUT_DIR}" |
87 |
- --with-spl="${EROOT}usr/src/${SPL_PATH}" |
88 |
- --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" |
89 |
$(use_enable debug) |
90 |
) |
91 |
|
92 |
@@ -118,29 +118,4 @@ pkg_postinst() { |
93 |
rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" |
94 |
rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
95 |
fi |
96 |
- |
97 |
- if use x86 || use arm |
98 |
- then |
99 |
- ewarn "32-bit kernels will likely require increasing vmalloc to" |
100 |
- ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |
101 |
- fi |
102 |
- |
103 |
- ewarn "This version of ZFSOnLinux includes support for new feature flags" |
104 |
- ewarn "that are incompatible with previous versions. GRUB2 support for" |
105 |
- ewarn "/boot with the new feature flags is not yet available." |
106 |
- ewarn "Do *NOT* upgrade root pools to use the new feature flags." |
107 |
- ewarn "Any new pools will be created with the new feature flags by default" |
108 |
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To" |
109 |
- ewarn "create a newpool that is backward compatible wih GRUB2, use " |
110 |
- ewarn |
111 |
- ewarn "zpool create -d -o feature@async_destroy=enabled " |
112 |
- ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" |
113 |
- ewarn " -o feature@spacemap_histogram=enabled" |
114 |
- ewarn " -o feature@enabled_txg=enabled " |
115 |
- ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" |
116 |
- ewarn " ..." |
117 |
- ewarn |
118 |
- ewarn "GRUB2 support will be updated as soon as either the GRUB2" |
119 |
- ewarn "developers do a tag or the Gentoo developers find time to backport" |
120 |
- ewarn "support from GRUB2 HEAD." |
121 |
} |