From 035c25028cb6f537c414c32d3e5eb51347edd423 Mon Sep 17 00:00:00 2001 From: Jesus Alvarez Date: Tue, 13 Sep 2016 00:48:51 -0700 Subject: [PATCH] Add conflicts=() For now it is necessary to manually add package conflicts. As archzfs grows to support more kernels, this fix will become unweildy. In the future the conflicts will be auto generated. Closes #58 --- packages/linux-lts/spl-linux-lts | 2 +- packages/linux-lts/spl-utils-linux-lts | 2 +- packages/linux-lts/zfs-linux-lts | 2 +- packages/linux-lts/zfs-utils-linux-lts | 2 +- packages/linux/spl-linux | 2 +- packages/linux/spl-linux-git | 2 +- packages/linux/spl-utils-linux | 2 +- packages/linux/spl-utils-linux-git | 2 +- packages/linux/zfs-linux | 2 +- packages/linux/zfs-linux-git | 2 +- packages/linux/zfs-utils-linux | 2 +- packages/linux/zfs-utils-linux-git | 2 +- src/kernels/linux-lts.sh | 6 +++++- src/kernels/linux.sh | 10 +++++++++- src/spl-utils/PKGBUILD.sh | 1 + src/spl/PKGBUILD.sh | 1 + src/zfs-utils/PKGBUILD.sh | 1 + src/zfs/PKGBUILD.sh | 1 + 18 files changed, 30 insertions(+), 14 deletions(-) diff --git a/packages/linux-lts/spl-linux-lts b/packages/linux-lts/spl-linux-lts index af77108..7cbb570 160000 --- a/packages/linux-lts/spl-linux-lts +++ b/packages/linux-lts/spl-linux-lts @@ -1 +1 @@ -Subproject commit af77108fc3248c66ecb82a1ecc642eadcca3cd15 +Subproject commit 7cbb570c06b7819b7201379191c9dbb92c802b86 diff --git a/packages/linux-lts/spl-utils-linux-lts b/packages/linux-lts/spl-utils-linux-lts index 766e26c..c27e32f 160000 --- a/packages/linux-lts/spl-utils-linux-lts +++ b/packages/linux-lts/spl-utils-linux-lts @@ -1 +1 @@ -Subproject commit 766e26c88ca61e26cd6aa0fc59261f8356fb7e30 +Subproject commit c27e32f9595155103b13e80ffe13dd78c83130e2 diff --git a/packages/linux-lts/zfs-linux-lts b/packages/linux-lts/zfs-linux-lts index 5af2427..a7f29c2 160000 --- a/packages/linux-lts/zfs-linux-lts +++ b/packages/linux-lts/zfs-linux-lts @@ -1 +1 @@ -Subproject commit 5af24272e8361c3db7b984cd1d19c071d62df726 +Subproject commit a7f29c2b6b597c91ff12a746ba606fc1693f0393 diff --git a/packages/linux-lts/zfs-utils-linux-lts b/packages/linux-lts/zfs-utils-linux-lts index 64eed5e..5e3316b 160000 --- a/packages/linux-lts/zfs-utils-linux-lts +++ b/packages/linux-lts/zfs-utils-linux-lts @@ -1 +1 @@ -Subproject commit 64eed5ed582c4e4d4c7f9a2f83f04cbf92cd2980 +Subproject commit 5e3316b6912208c89950649a3e47b4f9ff77e543 diff --git a/packages/linux/spl-linux b/packages/linux/spl-linux index 284b35e..eba0f54 160000 --- a/packages/linux/spl-linux +++ b/packages/linux/spl-linux @@ -1 +1 @@ -Subproject commit 284b35ea5a88d951645ccb65ac70c41202719b99 +Subproject commit eba0f547c1d129d827401929bb75b09c1aeecb72 diff --git a/packages/linux/spl-linux-git b/packages/linux/spl-linux-git index 764eb1f..e41569d 160000 --- a/packages/linux/spl-linux-git +++ b/packages/linux/spl-linux-git @@ -1 +1 @@ -Subproject commit 764eb1f99db871683e20a30e2f0a345eb406c7b7 +Subproject commit e41569df2793f734111442654d952a45b317da79 diff --git a/packages/linux/spl-utils-linux b/packages/linux/spl-utils-linux index 54a1a27..e73a917 160000 --- a/packages/linux/spl-utils-linux +++ b/packages/linux/spl-utils-linux @@ -1 +1 @@ -Subproject commit 54a1a27f388b10c025d72b10fd9953966c280ed6 +Subproject commit e73a9171e1d2b7e3f2b62f761f5dfc17349bfedd diff --git a/packages/linux/spl-utils-linux-git b/packages/linux/spl-utils-linux-git index 55dfe68..cb6d59f 160000 --- a/packages/linux/spl-utils-linux-git +++ b/packages/linux/spl-utils-linux-git @@ -1 +1 @@ -Subproject commit 55dfe683530610370e9ce633d07e9c1a2f965426 +Subproject commit cb6d59fb1ddec40f7621600084827105f8abfe6a diff --git a/packages/linux/zfs-linux b/packages/linux/zfs-linux index 575b30a..bf1b396 160000 --- a/packages/linux/zfs-linux +++ b/packages/linux/zfs-linux @@ -1 +1 @@ -Subproject commit 575b30a8c6588fba8d2a99dc7950249f41c51856 +Subproject commit bf1b396a48b2d71becc29d85cc8d051ca07bae4c diff --git a/packages/linux/zfs-linux-git b/packages/linux/zfs-linux-git index c6568a3..0ad7394 160000 --- a/packages/linux/zfs-linux-git +++ b/packages/linux/zfs-linux-git @@ -1 +1 @@ -Subproject commit c6568a3057df9e7a63e9215b00ce2618cc57e5cb +Subproject commit 0ad7394670dce0386e2a3a629b7bcbc13e57dbf7 diff --git a/packages/linux/zfs-utils-linux b/packages/linux/zfs-utils-linux index 2748de5..2ef2188 160000 --- a/packages/linux/zfs-utils-linux +++ b/packages/linux/zfs-utils-linux @@ -1 +1 @@ -Subproject commit 2748de5ec10e9675bb4816fe361bc60e2464179d +Subproject commit 2ef2188b531dc392764eb52e24b12c910996700d diff --git a/packages/linux/zfs-utils-linux-git b/packages/linux/zfs-utils-linux-git index 6059708..ddc9b7e 160000 --- a/packages/linux/zfs-utils-linux-git +++ b/packages/linux/zfs-utils-linux-git @@ -1 +1 @@ -Subproject commit 60597081f921f8f582c37fd4f39ecb7186b6ce82 +Subproject commit ddc9b7e0751b31103a6078212564db097b348b8f diff --git a/src/kernels/linux-lts.sh b/src/kernels/linux-lts.sh index 52069db..817e6c1 100644 --- a/src/kernels/linux-lts.sh +++ b/src/kernels/linux-lts.sh @@ -3,7 +3,7 @@ mode_name="lts" mode_desc="Select and use the packages for the linux-lts kernel" # Kernel versions for LTS packages -pkgrel="2" +pkgrel="3" kernel_version="4.4.20-1" header="\ @@ -36,6 +36,10 @@ update_linux_lts_pkgbuilds() { zfs_pkgver=${zol_version}_${kernel_version_full_pkgver} spl_pkgrel=${pkgrel} zfs_pkgrel=${pkgrel} + spl_utils_conflicts="'spl-utils-linux' 'spl-utils-linux-git'" + spl_conflicts="'spl-utils-linux' 'spl-utils-linux-git'" + zfs_utils_conflicts="'zfs-utils-linux' 'zfs-utils-linux-git'" + zfs_conflicts="'zfs-linux' 'zfs-linux-git'" spl_utils_pkgname="spl-utils-linux-lts" spl_pkgname="spl-linux-lts" zfs_utils_pkgname="zfs-utils-linux-lts" diff --git a/src/kernels/linux.sh b/src/kernels/linux.sh index 96c65bb..c103a24 100644 --- a/src/kernels/linux.sh +++ b/src/kernels/linux.sh @@ -3,7 +3,7 @@ mode_name="std" mode_desc="Select and use the packages for the default linux kernel" # Kernel versions for default ZFS packages -pkgrel="6" +pkgrel="7" kernel_version="4.7.2-1" # Kernel version for GIT packages @@ -43,6 +43,10 @@ update_linux_pkgbuilds() { zfs_pkgver=${zol_version}_${kernel_version_full_pkgver} spl_pkgrel=${pkgrel} zfs_pkgrel=${pkgrel} + spl_utils_conflicts="'spl-utils-linux-git' 'spl-utils-linux-lts'" + spl_conflicts="'spl-utils-linux-git' 'spl-utils-linux-lts'" + zfs_utils_conflicts="'zfs-utils-linux-git' 'zfs-utils-linux-lts'" + zfs_conflicts="'zfs-linux-git' 'zfs-linux-lts'" spl_utils_pkgname="spl-utils-linux" spl_pkgname="spl-linux" zfs_utils_pkgname="zfs-utils-linux" @@ -76,6 +80,10 @@ update_linux_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-linux' 'spl-utils-linux-lts'" + spl_conflicts="'spl-utils-linux' 'spl-utils-linux-lts'" + zfs_utils_conflicts="'zfs-utils-linux' 'zfs-utils-linux-lts'" + zfs_conflicts="'zfs-linux' 'zfs-linux-lts'" spl_utils_pkgname="spl-utils-linux-git" spl_pkgname="spl-linux-git" zfs_utils_pkgname="zfs-utils-linux-git" diff --git a/src/spl-utils/PKGBUILD.sh b/src/spl-utils/PKGBUILD.sh index a3af0f3..27cdd87 100755 --- a/src/spl-utils/PKGBUILD.sh +++ b/src/spl-utils/PKGBUILD.sh @@ -14,6 +14,7 @@ groups=("${archzfs_package_group}") license=("GPL") provides=("spl-utils") makedepends=(${linux_headers_depends} ${spl_makedepends}) +conflicts=(${spl_utils_conflicts}) ${spl_utils_replaces} build() { diff --git a/src/spl/PKGBUILD.sh b/src/spl/PKGBUILD.sh index e558fc1..1fc7e2d 100755 --- a/src/spl/PKGBUILD.sh +++ b/src/spl/PKGBUILD.sh @@ -16,6 +16,7 @@ groups=("${archzfs_package_group}") license=("GPL") install=spl.install provides=("spl") +conflicts=(${spl_conflicts}) ${spl_replaces} build() { diff --git a/src/zfs-utils/PKGBUILD.sh b/src/zfs-utils/PKGBUILD.sh index 3af4e27..f6721a9 100755 --- a/src/zfs-utils/PKGBUILD.sh +++ b/src/zfs-utils/PKGBUILD.sh @@ -22,6 +22,7 @@ license=("CDDL") groups=("${archzfs_package_group}") provides=("zfs-utils") install=zfs-utils.install +conflicts=(${zfs_utils_conflicts}) ${zfs_utils_replaces} build() { diff --git a/src/zfs/PKGBUILD.sh b/src/zfs/PKGBUILD.sh index b8d4dfb..71f3801 100755 --- a/src/zfs/PKGBUILD.sh +++ b/src/zfs/PKGBUILD.sh @@ -16,6 +16,7 @@ groups=("${archzfs_package_group}") license=("CDDL") install=zfs.install provides=("zfs") +conflicts=(${zfs_conflicts}) ${zfs_replaces} build() {