From da70746dbc314e1220e08ea2fb96a70e2ebbfdef Mon Sep 17 00:00:00 2001
From: Jan Houben <jan@et.tc>
Date: Wed, 12 Jul 2017 01:53:35 +0200
Subject: [PATCH] fix conflicts

---
 src/kernels/common.sh         | 8 ++++----
 src/kernels/linux-hardened.sh | 4 ++++
 src/kernels/linux-lts.sh      | 4 ++++
 src/kernels/linux.sh          | 8 ++++++--
 src/spl/PKGBUILD.sh           | 6 +++---
 src/zfs/PKGBUILD.sh           | 4 ++--
 6 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/kernels/common.sh b/src/kernels/common.sh
index ce74a67..2a573d5 100644
--- a/src/kernels/common.sh
+++ b/src/kernels/common.sh
@@ -28,8 +28,8 @@ update_common_pkgbuilds() {
     zfs_pkgver=${zol_version}
     spl_pkgrel=${pkgrel}
     zfs_pkgrel=${pkgrel}
-    spl_utils_conflicts="'spl-utils-common-git'"
-    zfs_utils_conflicts="'zfs-utils-common-git'"
+    spl_utils_conflicts="'spl-utils-common-git' 'spl-utils-linux-git' 'spl-utils-linux' 'spl-utils-linux-lts' 'spl-utils-linux-lts-git'"
+    zfs_utils_conflicts="'zfs-utils-common-git' 'zfs-utils-linux-git' 'zfs-utils-linux' 'zfs-utils-linux-lts' 'zfs-utils-linux-lts-git'"
     spl_utils_pkgname="spl-utils-common"
     zfs_utils_pkgname="zfs-utils-common"
     # Paths are relative to build.sh
@@ -50,8 +50,8 @@ update_common_git_pkgbuilds() {
     zfs_pkgver="" # Set later by call to git_calc_pkgver
     spl_pkgrel=${pkgrel_git}
     zfs_pkgrel=${pkgrel_git}
-    spl_utils_conflicts="'spl-utils-common'"
-    zfs_utils_conflicts="'zfs-utils-common'"
+    spl_utils_conflicts="'spl-utils-common' 'spl-utils-linux-git' 'spl-utils-linux' 'spl-utils-linux-lts' 'spl-utils-linux-lts-git'"
+    zfs_utils_conflicts="'zfs-utils-common' 'zfs-utils-linux-git' 'zfs-utils-linux' 'zfs-utils-linux-lts' 'zfs-utils-linux-lts-git'"
     spl_utils_pkgname="spl-utils-common-git"
     zfs_utils_pkgname="zfs-utils-common-git"
     spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}"
diff --git a/src/kernels/linux-hardened.sh b/src/kernels/linux-hardened.sh
index e70f59c..27a6994 100644
--- a/src/kernels/linux-hardened.sh
+++ b/src/kernels/linux-hardened.sh
@@ -46,6 +46,8 @@ update_linux_hardened_pkgbuilds() {
     spl_pkgrel=${pkgrel}
     zfs_pkgrel=${pkgrel}
     spl_conflicts="'spl-linux-hardened-git'"
+    spl_headers_conflicts="'spl-linux-hardened-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-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers'"
     zfs_conflicts="'zfs-linux-hardened-git'"
     spl_utils_pkgname="spl-utils-common"
     spl_pkgname="spl-linux-hardened"
@@ -75,6 +77,8 @@ update_linux_hardened_pkgbuilds() {
 #     spl_pkgrel=${pkgrel_git}
 #     zfs_pkgrel=${pkgrel_git}
 #     spl_conflicts="'spl-linux-hardened'"
+#     spl_headers_conflicts="'spl-linux-hardened-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
+#     zfs_headers_conflicts="'zfs-linux-hardened-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers'"
 #     zfs_conflicts="'zfs-linux-hardened'"
 #     spl_utils_pkgname="spl-utils-common-git"
 #     spl_pkgname="spl-linux-hardened-git"
diff --git a/src/kernels/linux-lts.sh b/src/kernels/linux-lts.sh
index c993ef5..2a192a6 100644
--- a/src/kernels/linux-lts.sh
+++ b/src/kernels/linux-lts.sh
@@ -45,6 +45,8 @@ update_linux_lts_pkgbuilds() {
     spl_pkgrel=${pkgrel}
     zfs_pkgrel=${pkgrel}
     spl_conflicts="'spl-linux-lts-git'"
+    spl_headers_conflicts="'spl-linux-lts-git-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
+    zfs_headers_conflicts="'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
     zfs_conflicts="'zfs-linux-lts-git'"
     spl_utils_pkgname="spl-utils-common"
     spl_pkgname="spl-linux-lts"
@@ -74,6 +76,8 @@ update_linux_lts_git_pkgbuilds() {
     spl_pkgrel=${pkgrel_git}
     zfs_pkgrel=${pkgrel_git}
     spl_conflicts="'spl-linux-lts'"
+    spl_headers_conflicts="'spl-linux-lts-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
+    zfs_headers_conflicts="'zfs-linux-lts-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
     zfs_conflicts="'zfs-linux-lts'"
     spl_utils_pkgname="spl-utils-common-git"
     spl_pkgname="spl-linux-lts-git"
diff --git a/src/kernels/linux.sh b/src/kernels/linux.sh
index 82b8f3d..e2820f1 100644
--- a/src/kernels/linux.sh
+++ b/src/kernels/linux.sh
@@ -43,8 +43,10 @@ update_linux_pkgbuilds() {
     zfs_pkgver=${zol_version}_${kernel_version_full_pkgver}
     spl_pkgrel=${pkgrel}
     zfs_pkgrel=${pkgrel}
-    spl_conflicts="'spl-linux-lts-git'"
-    zfs_conflicts="'zfs-linux-lts-git'"
+    spl_conflicts="'spl-linux-git'"
+    spl_headers_conflicts="'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-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
+    zfs_conflicts="'zfs-linux-git'"
     spl_pkgname="spl-linux"
     spl_utils_pkgname="spl-utils-common"
     zfs_pkgname="zfs-linux"
@@ -76,6 +78,8 @@ update_linux_git_pkgbuilds() {
     spl_pkgrel=${pkgrel_git}
     zfs_pkgrel=${pkgrel_git}
     spl_conflicts="'spl-linux'"
+    spl_headers_conflicts="'spl-linux-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
+    zfs_headers_conflicts="'zfs-linux-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers'"
     zfs_conflicts="'zfs-linux'"
     spl_pkgname="spl-linux-git"
     spl_utils_pkgname="spl-utils-common-git"
diff --git a/src/spl/PKGBUILD.sh b/src/spl/PKGBUILD.sh
index cce8996..00e17de 100755
--- a/src/spl/PKGBUILD.sh
+++ b/src/spl/PKGBUILD.sh
@@ -11,7 +11,6 @@ arch=("x86_64")
 url="http://zfsonlinux.org/"
 source=("${spl_src_target}")
 sha256sums=("${spl_src_hash}")
-groups=("${archzfs_package_group}")
 license=("GPL")
 
 build() {
@@ -29,9 +28,10 @@ package_${spl_pkgname}() {
     depends=("${spl_utils_pkgname}" "kmod" ${linux_depends})
     install=spl.install
     provides=("spl")
+    groups=("${archzfs_package_group}")
     conflicts=(${spl_conflicts})
     ${spl_replaces}
-
+    
     cd "${spl_workdir}"
     make DESTDIR="\${pkgdir}" install
     mv "\${pkgdir}/lib" "\${pkgdir}/usr/"
@@ -42,7 +42,7 @@ package_${spl_pkgname}() {
 
 package_${spl_pkgname}-headers() {
     pkgdesc="Solaris Porting Layer kernel headers."
-    conflicts=(${spl_conflicts})
+    conflicts=(${spl_headers_conflicts})
     
     cd "${spl_workdir}"
     make DESTDIR="\${pkgdir}" install
diff --git a/src/zfs/PKGBUILD.sh b/src/zfs/PKGBUILD.sh
index c847980..20450c4 100755
--- a/src/zfs/PKGBUILD.sh
+++ b/src/zfs/PKGBUILD.sh
@@ -11,7 +11,6 @@ arch=("x86_64")
 url="http://zfsonlinux.org/"
 source=("${zfs_src_target}")
 sha256sums=("${zfs_src_hash}")
-groups=("${archzfs_package_group}")
 license=("CDDL")
 
 build() {
@@ -30,6 +29,7 @@ package_${zfs_pkgname}() {
     depends=("kmod" "${spl_pkgname}" "${zfs_utils_pkgname}" ${linux_depends})
     install=zfs.install
     provides=("zfs")
+    groups=("${archzfs_package_group}")
     conflicts=(${zfs_conflicts})
     ${zfs_replaces}
     
@@ -44,7 +44,7 @@ package_${zfs_pkgname}() {
 
 package_${zfs_pkgname}-headers() {
     pkgdesc="Kernel headers for the Zettabyte File System."
-    conflicts=(${zfs_conflicts})
+    conflicts=(${zfs_headers_conflicts})
     
     cd "${zfs_workdir}"
     make DESTDIR="\${pkgdir}" install