From 517d2471921fc44622dc737b09b655829b8c9c6f Mon Sep 17 00:00:00 2001
From: Richard Yao <ryao@gentoo.org>
Date: Fri, 15 Jun 2018 18:16:29 -0400
Subject: [PATCH] copy-builtin: SPL must be in Kbuild first

The recent SPL merge caused a regression in kernels with ZFS integrated
into the sources where our modules would be initialized in alphabetical
order, despite icp requiring the spl module be loaded first. This caused
kernels with ZFS builtin to fail to boot.

We resolve this by adding a special case for the spl that lists it
first. It is somewhat ugly, but it works.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Matthew Thode <prometheanfire@gentoo.org>
Signed-off-by: Richard Yao <ryao@gentoo.org>
Closes #7595
Closes #7606
---
 copy-builtin | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/copy-builtin b/copy-builtin
index 02c0926c3..8be8b4381 100755
--- a/copy-builtin
+++ b/copy-builtin
@@ -12,9 +12,11 @@ usage()
 KERNEL_DIR="$(readlink --canonicalize-existing "$1")"
 
 MODULES=()
+MODULES+="spl"
 for MODULE_DIR in module/*
 do
 	[ -d "$MODULE_DIR" ] || continue
+	[ "spl" = "${MODULE_DIR##*/}" ] && continue
 	MODULES+=("${MODULE_DIR##*/}")
 done