From b158d0f87db785ff75d6b99238918ff36ca8b345 Mon Sep 17 00:00:00 2001
From: Jan Houben <jan@et.tc>
Date: Sat, 26 Aug 2017 18:43:48 +0200
Subject: [PATCH] adapt #134 for linux-zen

---
 src/kernels/linux-zen.sh | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/kernels/linux-zen.sh b/src/kernels/linux-zen.sh
index 01e721d..a58bc57 100644
--- a/src/kernels/linux-zen.sh
+++ b/src/kernels/linux-zen.sh
@@ -44,12 +44,10 @@ update_linux_pkgbuilds() {
     spl_pkgrel=${pkgrel}
     zfs_pkgrel=${pkgrel}
     spl_conflicts="'spl-linux-zen-git'"
-    spl_headers_conflicts="'spl-linux-zen-git-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
-    zfs_headers_conflicts="'zfs-linux-zen-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
     zfs_conflicts="'zfs-linux-zen-git'"
-    spl_utils_pkgname="spl-utils-common"
+    spl_utils_pkgname="spl-utils-common>=${zol_version}"
     spl_pkgname="spl-linux-zen"
-    zfs_utils_pkgname="zfs-utils-common"
+    zfs_utils_pkgname="zfs-utils-common>=${zol_version}"
     zfs_pkgname="zfs-linux-zen"
     # Paths are relative to build.sh
     spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
@@ -66,9 +64,9 @@ update_linux_pkgbuilds() {
 update_linux_git_pkgbuilds() {
     pkg_list=("spl-linux-zen-git" "zfs-linux-zen-git")
     kernel_version=${kernel_version_git}
-    kernel_version_full=$(kernel_version_full ${kernel_version_git})
-    kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version_git})
-    kernel_version_major=${kernel_version_git%-*}
+    kernel_version_full=$(kernel_version_full ${kernel_version})
+    kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
+    kernel_version_major=${kernel_version%-*}
     kernel_mod_path="${kernel_version_full}-zen"
     archzfs_package_group="archzfs-linux-zen-git"
     spl_pkgver="" # Set later by call to git_calc_pkgver
@@ -76,12 +74,8 @@ update_linux_git_pkgbuilds() {
     spl_pkgrel=${pkgrel_git}
     zfs_pkgrel=${pkgrel_git}
     spl_conflicts="'spl-linux-zen'"
-    spl_headers_conflicts="'spl-linux-zen-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
-    zfs_headers_conflicts="'zfs-linux-zen-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
     zfs_conflicts="'zfs-linux-zen'"
-    spl_utils_pkgname="spl-utils-common-git"
     spl_pkgname="spl-linux-zen-git"
-    zfs_utils_pkgname="zfs-utils-common-git"
     zfs_pkgname="zfs-linux-zen-git"
     spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
     zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
@@ -105,4 +99,6 @@ update_linux_git_pkgbuilds() {
         git_check_repo
         git_calc_pkgver
     fi
+    spl_utils_pkgname="spl-utils-common-git>=${spl_git_ver}"
+    zfs_utils_pkgname="zfs-utils-common-git>=${zfs_git_ver}"
 }