[PATCH] UBUNTU: [Packaging] replace zfs and spl build with zfs 0.8.1-1ubuntu1

[Colin King]

From: Colin Ian King <colin.king at canonical.com>

Moving to 0.8.1-1ubuntu1 has the benefit of having the split SPL/ZFS
dkms packages being merged into dkms. Update to the new version and
remove the spl dkms package sync'ing.

Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
 debian/dkms-versions            | 3 +--
 debian/rules.d/2-binary-arch.mk | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/dkms-versions b/debian/dkms-versions
index c8e85f6..fa81c7a 100644
--- a/debian/dkms-versions
+++ b/debian/dkms-versions
@@ -1,5 +1,4 @@
-spl-linux 0.7.12-1ubuntu4
-zfs-linux 0.7.12-1ubuntu8
+zfs-linux 0.8.1-1ubuntu1
 nvidia-graphics-drivers-390 390.116-0ubuntu2
 nvidia-graphics-drivers-430 430.26-0ubuntu1
 virtualbox 6.0.8-dfsg-7
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 7b386e9..f3ab067 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -399,7 +399,6 @@ endif
 	install -d $(dkms_dir) $(dkms_dir)/headers $(dkms_dir)/build $(dkms_dir)/source
 	cp -rp "$(hdrdir)" "$(indep_hdrdir)" "$(dkms_dir)/headers"
 
-	$(if $(filter true,$(enable_zfs)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, spl, pool/universe/s/spl-linux/spl-dkms_$(dkms_spl_linux_version)_all.deb))
 	$(if $(filter true,$(enable_zfs)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, zfs, pool/universe/z/zfs-linux/zfs-dkms_$(dkms_zfs_linux_version)_all.deb))
 
 ifeq ($(do_dkms_nvidia),true)
-- 
2.7.4