merge: master <--- rebuild/20220929

* HEAD
| \
| * db6a9aa <github@luxolus.com> pkgbuild: 15.2.14-8 -> 15.2.14-9
| * d56eceb <github@luxolus.com> pkgbuild: add explicit conflicts() for each pkg
| /
| master

Signed-off-by: Bazaah <github@luxolus.com>
This commit is contained in:
Bazaah
2022-09-29 11:17:35 +00:00
2 changed files with 18 additions and 16 deletions

View File

@@ -1,7 +1,7 @@
pkgbase = ceph-bin pkgbase = ceph-bin
pkgdesc = Distributed, fault-tolerant storage platform delivering object, block, and file system pkgdesc = Distributed, fault-tolerant storage platform delivering object, block, and file system
pkgver = 15.2.14 pkgver = 15.2.14
pkgrel = 8 pkgrel = 9
url = https://ceph.com/ url = https://ceph.com/
arch = x86_64 arch = x86_64
license = GPL license = GPL
@@ -9,15 +9,15 @@ pkgbase = ceph-bin
noextract = ceph-libs-bin-15.2.14.tar.zst noextract = ceph-libs-bin-15.2.14.tar.zst
noextract = ceph-mgr-bin-15.2.14.tar.zst noextract = ceph-mgr-bin-15.2.14.tar.zst
options = emptydirs options = emptydirs
source = ceph-bin-15.2.14.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/v15.2.14-7/ceph_linux_x86_64.tar.zstd source = ceph-bin-15.2.14.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/v15.2.14-9/ceph_linux_x86_64.tar.zstd
source = ceph-libs-bin-15.2.14.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/v15.2.14-7/ceph_libs_linux_x86_64.tar.zstd source = ceph-libs-bin-15.2.14.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/v15.2.14-9/ceph_libs_linux_x86_64.tar.zstd
source = ceph-mgr-bin-15.2.14.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/v15.2.14-7/ceph_mgr_linux_x86_64.tar.zstd source = ceph-mgr-bin-15.2.14.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/v15.2.14-9/ceph_mgr_linux_x86_64.tar.zstd
sha512sums = d8ed4d19f3638a18e16cadabf7a6eaab32bb37c5700fbd4559aa226e3406fc528a79c699de75ff29deb2c50b0c027261b9e671958674a16f96674deb6411a8b5 sha512sums = d8ed4d19f3638a18e16cadabf7a6eaab32bb37c5700fbd4559aa226e3406fc528a79c699de75ff29deb2c50b0c027261b9e671958674a16f96674deb6411a8b5
sha512sums = e0ee00643cd6f5d829a0ab2bddc4d52aa98db915e9c25020e4aefb731aceae154f0793694e7257b005c5a8e7a1d3c5b1c51d081e560981d36417a0e999fdc920 sha512sums = e0ee00643cd6f5d829a0ab2bddc4d52aa98db915e9c25020e4aefb731aceae154f0793694e7257b005c5a8e7a1d3c5b1c51d081e560981d36417a0e999fdc920
sha512sums = f07c64fdde6b99ab3849eefcdf1099058874c49d2a5cb530a9857347f4be76f77fff6a0df3bc7c83339b8c643797861548a69b35067d9d9081996fef71dac1b4 sha512sums = f07c64fdde6b99ab3849eefcdf1099058874c49d2a5cb530a9857347f4be76f77fff6a0df3bc7c83339b8c643797861548a69b35067d9d9081996fef71dac1b4
pkgname = ceph-bin pkgname = ceph-bin
depends = ceph-libs=15.2.14-8 depends = ceph-libs=15.2.14-9
depends = boost-libs depends = boost-libs
depends = curl depends = curl
depends = fuse2 depends = fuse2
@@ -52,7 +52,7 @@ pkgname = ceph-bin
depends = xfsprogs depends = xfsprogs
depends = python-yaml depends = python-yaml
depends = python-pyaml depends = python-pyaml
provides = ceph=15.2.14-8 provides = ceph=15.2.14-9
pkgname = ceph-libs-bin pkgname = ceph-libs-bin
depends = boost-libs depends = boost-libs
@@ -68,11 +68,11 @@ pkgname = ceph-libs-bin
depends = snappy depends = snappy
depends = systemd-libs depends = systemd-libs
depends = fmt depends = fmt
provides = ceph-libs=15.2.14-8 provides = ceph-libs=15.2.14-9
pkgname = ceph-mgr-bin pkgname = ceph-mgr-bin
depends = ceph=15.2.14-8 depends = ceph=15.2.14-9
depends = ceph-libs=15.2.14-8 depends = ceph-libs=15.2.14-9
depends = bash depends = bash
depends = boost-libs depends = boost-libs
depends = coffeescript depends = coffeescript
@@ -95,7 +95,7 @@ pkgname = ceph-mgr-bin
optdepends = python-kubernetes: rook module optdepends = python-kubernetes: rook module
optdepends = python-prometheus_client: prometheus module optdepends = python-prometheus_client: prometheus module
optdepends = python-remoto: ssh module optdepends = python-remoto: ssh module
provides = ceph-mgr=15.2.14-8 provides = ceph-mgr=15.2.14-9
conflicts = ceph<14.2.1-1 conflicts = ceph<14.2.1-1
options = emptydirs options = emptydirs
options = !strip options = !strip

View File

@@ -3,19 +3,19 @@
pkgbase='ceph-bin' pkgbase='ceph-bin'
pkgname=('ceph-bin' 'ceph-libs-bin' 'ceph-mgr-bin') pkgname=('ceph-bin' 'ceph-libs-bin' 'ceph-mgr-bin')
pkgver=15.2.14 pkgver=15.2.14
pkgrel=8 pkgrel=9
pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system' pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
arch=('x86_64') arch=('x86_64')
url='https://ceph.com/' url='https://ceph.com/'
license=('GPL') license=('GPL')
options=('emptydirs') options=('emptydirs')
_artifact=v${pkgver}-7 _artifact=v${pkgver}-${pkgrel}
source=("ceph-bin-${pkgver}.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/${_artifact}/ceph_linux_${arch}.tar.zstd" source=("ceph-bin-${pkgver}.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/${_artifact}/ceph_linux_${arch}.tar.zstd"
"ceph-libs-bin-${pkgver}.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/${_artifact}/ceph_libs_linux_${arch}.tar.zstd" "ceph-libs-bin-${pkgver}.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/${_artifact}/ceph_libs_linux_${arch}.tar.zstd"
"ceph-mgr-bin-${pkgver}.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/${_artifact}/ceph_mgr_linux_${arch}.tar.zstd") "ceph-mgr-bin-${pkgver}.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/${_artifact}/ceph_mgr_linux_${arch}.tar.zstd")
sha512sums=('d8ed4d19f3638a18e16cadabf7a6eaab32bb37c5700fbd4559aa226e3406fc528a79c699de75ff29deb2c50b0c027261b9e671958674a16f96674deb6411a8b5' sha512sums=('e81d6e71299ce30b65c89b755989ecd0aed9f922b62b4f202586722645498591e79e72e5de2c99bbc881c5bb1a0ed857c7a96aefaddc339f345a9cc82e7686df'
'e0ee00643cd6f5d829a0ab2bddc4d52aa98db915e9c25020e4aefb731aceae154f0793694e7257b005c5a8e7a1d3c5b1c51d081e560981d36417a0e999fdc920' 'b9475a85f3f2c9f48b95d4169c7169e12f1bfa1e9bf5a3e027d8587b117355065cd0bf3503ff98363bd65e42e86ec5e2594a3a32e2950e02a11e77864b144b33'
'f07c64fdde6b99ab3849eefcdf1099058874c49d2a5cb530a9857347f4be76f77fff6a0df3bc7c83339b8c643797861548a69b35067d9d9081996fef71dac1b4') 'f0388a44afb2f86b91dd9b199147ad558f4d823091abca4375ac9671c3a38c84fc284b7e6c3b07197440611b49f0f24f24ded0ef048eefa73087002705c1d47f')
# Don't extract source archives # Don't extract source archives
noextract=("${source[@]%%::*}") noextract=("${source[@]%%::*}")
@@ -24,6 +24,7 @@ package_ceph-libs-bin() {
depends=('boost-libs' 'curl' 'glibc' 'keyutils' 'libutil-linux' 'bzip2' 'lz4' 'nss' depends=('boost-libs' 'curl' 'glibc' 'keyutils' 'libutil-linux' 'bzip2' 'lz4' 'nss'
'oath-toolkit' 'python' 'snappy' 'systemd-libs' 'fmt') 'oath-toolkit' 'python' 'snappy' 'systemd-libs' 'fmt')
provides=("ceph-libs=${pkgver}-${pkgrel}") provides=("ceph-libs=${pkgver}-${pkgrel}")
conflicts=('ceph-libs')
cd "${srcdir}" cd "${srcdir}"
@@ -40,6 +41,7 @@ package_ceph-bin() {
'python-flask' 'python-pecan' 'python-pyopenssl' 'python-requests' 'python-werkzeug' 'xfsprogs' 'python-flask' 'python-pecan' 'python-pyopenssl' 'python-requests' 'python-werkzeug' 'xfsprogs'
'python-yaml' 'python-pyaml') 'python-yaml' 'python-pyaml')
provides=("ceph=${pkgver}-${pkgrel}") provides=("ceph=${pkgver}-${pkgrel}")
conflicts=('ceph')
cd "${srcdir}" cd "${srcdir}"
@@ -57,7 +59,7 @@ package_ceph-mgr-bin() {
'python-prometheus_client: prometheus module' 'python-prometheus_client: prometheus module'
'python-remoto: ssh module') 'python-remoto: ssh module')
provides=("ceph-mgr=${pkgver}-${pkgrel}") provides=("ceph-mgr=${pkgver}-${pkgrel}")
conflicts=('ceph<14.2.1-1') conflicts=('ceph-mgr')
options=('emptydirs' '!strip') options=('emptydirs' '!strip')
cd "${srcdir}" cd "${srcdir}"