From 3793c997a2091476b33ad8a65ac1011676752dac Mon Sep 17 00:00:00 2001
From: Richard Yao <ryao@gentoo.org>
Date: Thu, 31 May 2018 11:05:26 -0400
Subject: sys-fs/zfs-kmod-9999: Fix build failures

Merging the SPL into the upstream repository required changes to the
ebuild.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
---
 sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 43 ++++++++----------------------------
 1 file changed, 9 insertions(+), 34 deletions(-)

(limited to 'sys-fs')

diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 1b30e443205..ad612dbbc60 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -18,35 +18,38 @@ inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="http://zfsonlinux.org/"
 
-LICENSE="CDDL debug? ( GPL-2+ )"
+LICENSE="CDDL GPL-2+"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 RESTRICT="debug? ( strip ) test"
 
 DEPEND="
-	=sys-kernel/spl-${PV}*
 	dev-lang/perl
 	virtual/awk
 "
 
 RDEPEND="${DEPEND}
 	!sys-fs/zfs-fuse
+	!sys-kernel/spl
 "
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
+DOCS=( AUTHORS COPYRIGHT NOTICE META README.md )
 
 pkg_setup() {
 	linux-info_pkg_setup
 	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
 		!CONFIG_REISER4_FS
+		!DEBUG_LOCK_ALLOC
+		!GRKERNSEC_RANDSTRUCT
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!TRIM_UNUSED_KSYMS
 		EFI_PARTITION
 		IOSCHED_NOOP
+		KALLSYMS
 		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
 		ZLIB_DEFLATE
 		ZLIB_INFLATE
 	"
@@ -66,7 +69,7 @@ pkg_setup() {
 	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
 
 	[ ${PV} != "9999" ] && \
-		{ kernel_is le 4 13 || die "Linux 4.13 is the latest supported version."; }
+		{ kernel_is le 4 16 || die "Linux 4.16 is the latest supported version."; }
 
 	check_extra_config
 }
@@ -83,7 +86,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
 	use custom-cflags || strip-flags
 	filter-ldflags -Wl,*
 
@@ -94,8 +96,6 @@ src_configure() {
 		--with-config=kernel
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
-		--with-spl="${EROOT}usr/src/${SPL_PATH}"
-		--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
 		$(use_enable debug)
 	)
 
@@ -118,29 +118,4 @@ pkg_postinst() {
 		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
 		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
 	fi
-
-	if use x86 || use arm
-	then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of ZFSOnLinux includes support for new feature flags"
-	ewarn "that are incompatible with previous versions. GRUB2 support for"
-	ewarn "/boot with the new feature flags is not yet available."
-	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-	ewarn "Any new pools will be created with the new feature flags by default"
-	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
-	ewarn "create a newpool that is backward compatible wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
 }
-- 
cgit v1.2.1