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
extramodules
Jesus Alvarez 9 years ago
parent 90e1dcbcb1
commit 035c25028c
  1. 2
      packages/linux-lts/spl-linux-lts
  2. 2
      packages/linux-lts/spl-utils-linux-lts
  3. 2
      packages/linux-lts/zfs-linux-lts
  4. 2
      packages/linux-lts/zfs-utils-linux-lts
  5. 2
      packages/linux/spl-linux
  6. 2
      packages/linux/spl-linux-git
  7. 2
      packages/linux/spl-utils-linux
  8. 2
      packages/linux/spl-utils-linux-git
  9. 2
      packages/linux/zfs-linux
  10. 2
      packages/linux/zfs-linux-git
  11. 2
      packages/linux/zfs-utils-linux
  12. 2
      packages/linux/zfs-utils-linux-git
  13. 6
      src/kernels/linux-lts.sh
  14. 10
      src/kernels/linux.sh
  15. 1
      src/spl-utils/PKGBUILD.sh
  16. 1
      src/spl/PKGBUILD.sh
  17. 1
      src/zfs-utils/PKGBUILD.sh
  18. 1
      src/zfs/PKGBUILD.sh

@ -1 +1 @@
Subproject commit af77108fc3248c66ecb82a1ecc642eadcca3cd15
Subproject commit 7cbb570c06b7819b7201379191c9dbb92c802b86

@ -1 +1 @@
Subproject commit 766e26c88ca61e26cd6aa0fc59261f8356fb7e30
Subproject commit c27e32f9595155103b13e80ffe13dd78c83130e2

@ -1 +1 @@
Subproject commit 5af24272e8361c3db7b984cd1d19c071d62df726
Subproject commit a7f29c2b6b597c91ff12a746ba606fc1693f0393

@ -1 +1 @@
Subproject commit 64eed5ed582c4e4d4c7f9a2f83f04cbf92cd2980
Subproject commit 5e3316b6912208c89950649a3e47b4f9ff77e543

@ -1 +1 @@
Subproject commit 284b35ea5a88d951645ccb65ac70c41202719b99
Subproject commit eba0f547c1d129d827401929bb75b09c1aeecb72

@ -1 +1 @@
Subproject commit 764eb1f99db871683e20a30e2f0a345eb406c7b7
Subproject commit e41569df2793f734111442654d952a45b317da79

@ -1 +1 @@
Subproject commit 54a1a27f388b10c025d72b10fd9953966c280ed6
Subproject commit e73a9171e1d2b7e3f2b62f761f5dfc17349bfedd

@ -1 +1 @@
Subproject commit 55dfe683530610370e9ce633d07e9c1a2f965426
Subproject commit cb6d59fb1ddec40f7621600084827105f8abfe6a

@ -1 +1 @@
Subproject commit 575b30a8c6588fba8d2a99dc7950249f41c51856
Subproject commit bf1b396a48b2d71becc29d85cc8d051ca07bae4c

@ -1 +1 @@
Subproject commit c6568a3057df9e7a63e9215b00ce2618cc57e5cb
Subproject commit 0ad7394670dce0386e2a3a629b7bcbc13e57dbf7

@ -1 +1 @@
Subproject commit 2748de5ec10e9675bb4816fe361bc60e2464179d
Subproject commit 2ef2188b531dc392764eb52e24b12c910996700d

@ -1 +1 @@
Subproject commit 60597081f921f8f582c37fd4f39ecb7186b6ce82
Subproject commit ddc9b7e0751b31103a6078212564db097b348b8f

@ -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"

@ -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"

@ -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() {

@ -16,6 +16,7 @@ groups=("${archzfs_package_group}")
license=("GPL")
install=spl.install
provides=("spl")
conflicts=(${spl_conflicts})
${spl_replaces}
build() {

@ -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() {

@ -16,6 +16,7 @@ groups=("${archzfs_package_group}")
license=("CDDL")
install=zfs.install
provides=("zfs")
conflicts=(${zfs_conflicts})
${zfs_replaces}
build() {

Loading…
Cancel
Save