From 69a91a06275cbbd5d44c9e5c7d2ba4c9950bfb19 Mon Sep 17 00:00:00 2001 From: Bazaah Date: Wed, 21 Dec 2022 16:53:45 +0000 Subject: [PATCH 1/3] pkgbuild: package_ceph backup /etc/ conf Issue: https://github.com/bazaah/aur-ceph/issues/9 Backport-from: https://git.st8l.com/luxolus/aur-ceph/commit/50b8266 --- .SRCINFO | 4 ++++ PKGBUILD | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.SRCINFO b/.SRCINFO index 6cc7559..3593297 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -44,6 +44,10 @@ pkgname = ceph-bin optdepends = nvme-cli: disk monitoring for NVMe drives provides = ceph=17.2.5-4 conflicts = ceph + backup = etc/logrotate.d/ceph + backup = etc/udev/rules.d/50-ceph-rbd.rules + backup = etc/sysctl.d/90-ceph-osd.conf + backup = etc/sudoers.d/90-ceph pkgname = ceph-libs-bin depends = boost-libs diff --git a/PKGBUILD b/PKGBUILD index 8fccf82..85cf81b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -40,6 +40,10 @@ package_ceph-bin() { 'ncurses' 'nss' 'oath-toolkit' 'python' 'snappy' 'sudo' 'systemd-libs' 'lua' 'gawk') + backup=('etc/logrotate.d/ceph' + 'etc/udev/rules.d/50-ceph-rbd.rules' + 'etc/sysctl.d/90-ceph-osd.conf' + 'etc/sudoers.d/90-ceph') optdepends=('smartmontools: disk monitoring via S.M.A.R.T' 'nvme-cli: disk monitoring for NVMe drives') provides=("ceph=${pkgver}-${pkgrel}") From 018681798998ec61ec6f00945e4498ba611ed043 Mon Sep 17 00:00:00 2001 From: Bazaah Date: Wed, 21 Dec 2022 17:02:52 +0000 Subject: [PATCH 2/3] pkgbuild: add missing deps for libs,mgr Missed from the src ceph PKGBUILD somewhere along the way, added now. Issue: https://github.com/bazaah/aur-ceph/issues/7 Reported-by: aur.archlinux.org/account/antage --- .SRCINFO | 2 ++ PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3593297..e71865b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -68,6 +68,7 @@ pkgname = ceph-libs-bin depends = librdkafka depends = libaio depends = gperftools + depends = librabbitmq-c depends = python-prettytable depends = python-yaml depends = python-setuptools @@ -88,6 +89,7 @@ pkgname = ceph-mgr-bin depends = python-pecan depends = python-pyjwt depends = python-more-itertools + depends = python-routes depends = python-numpy depends = python-scipy depends = python-six diff --git a/PKGBUILD b/PKGBUILD index 85cf81b..5fc88c8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -23,7 +23,7 @@ noextract=("${source[@]%%::*}") package_ceph-libs-bin() { depends=('boost-libs' 'curl' 'glibc' 'keyutils' 'libutil-linux' 'bzip2' 'lz4' 'nss' 'oath-toolkit' 'python' 'snappy' 'systemd-libs' 'fmt' 'cryptsetup' - 'lua' 'librdkafka' 'libaio' 'gperftools' + 'lua' 'librdkafka' 'libaio' 'gperftools' 'librabbitmq-c' 'python-prettytable' 'python-yaml' 'python-setuptools') provides=("ceph-libs=${pkgver}-${pkgrel}") conflicts=('ceph-libs') @@ -57,7 +57,7 @@ package_ceph-bin() { package_ceph-mgr-bin() { depends=("ceph=${pkgver}-${pkgrel}" "ceph-libs=${pkgver}-${pkgrel}" 'bash' 'boost-libs' 'curl' 'gperftools' 'nss' 'fmt' - 'python' 'python-cherrypy' 'python-pecan' 'python-pyjwt' 'python-more-itertools' + 'python' 'python-cherrypy' 'python-pecan' 'python-pyjwt' 'python-more-itertools' 'python-routes' 'python-numpy' 'python-scipy' 'python-six' 'python-coverage' 'python-pytest' 'python-dateutil' 'python-prettytable' 'python-requests' 'python-pyopenssl' 'python-bcrypt' 'python-yaml' 'python-werkzeug' 'python-jinja') From 31182c64b4e97206f10af9a3869ebec8cb55fc8e Mon Sep 17 00:00:00 2001 From: Bazaah Date: Fri, 23 Dec 2022 20:47:51 +0000 Subject: [PATCH 3/3] pkgbuild: pkgrel=5 --- .SRCINFO | 32 ++++++++++++++++---------------- PKGBUILD | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e71865b..8e60ce6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,23 +1,23 @@ pkgbase = ceph-bin pkgdesc = Distributed, fault-tolerant storage platform delivering object, block, and file system pkgver = 17.2.5 - pkgrel = 4 + pkgrel = 5 url = https://ceph.com/ arch = x86_64 license = GPL - noextract = ceph-bin-17.2.5-4.tar.zst - noextract = ceph-libs-bin-17.2.5-4.tar.zst - noextract = ceph-mgr-bin-17.2.5-4.tar.zst + noextract = ceph-bin-17.2.5-5.tar.zst + noextract = ceph-libs-bin-17.2.5-5.tar.zst + noextract = ceph-mgr-bin-17.2.5-5.tar.zst options = emptydirs - source = ceph-bin-17.2.5-4.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/v17.2.5-4/ceph_linux_x86_64.tar.zstd - source = ceph-libs-bin-17.2.5-4.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/v17.2.5-4/ceph_libs_linux_x86_64.tar.zstd - source = ceph-mgr-bin-17.2.5-4.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/v17.2.5-4/ceph_mgr_linux_x86_64.tar.zstd - sha512sums = 1771dd508a329a7a379b3023d6c538719eef29b3534d967e545a55f4e6cd5c84456bbf823ab91c394c90e64eb42213a1a28c96c8c1d632240e2f5415ba8401c0 - sha512sums = ad068ef3c4e7dcfeafd18855450b2a1fa19bc22bc4036ba1ca32bbf97e44cebd54ba701e25b165b217448af5d35ba5f48cbadd3d7a6bf084bd17d4f54c400ac7 - sha512sums = 4e0cfe0c17a092aa320cc025a7aff9544c7f94c5bd80ab8de2498eb1a81235a620096fcada82301efce51d8d69b53500e65d7feb22fca91524972ef91413d7ae + source = ceph-bin-17.2.5-5.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/v17.2.5-5/ceph_linux_x86_64.tar.zstd + source = ceph-libs-bin-17.2.5-5.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/v17.2.5-5/ceph_libs_linux_x86_64.tar.zstd + source = ceph-mgr-bin-17.2.5-5.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/v17.2.5-5/ceph_mgr_linux_x86_64.tar.zstd + sha512sums = 15cfadd37b088791e4fe240fdcb15471e952f740722e9d20a9ea535de5e82acb59bdcf42de4b94bc694948469c2a8ea442b8157670c5ec94c2e617a86a0ac43f + sha512sums = 445bf7563f3b14c34e79fcee902905c89dc52bd6a5871384e3d9bddbfc8e101c1c23da41695e21e4faef49841023ffd73a18a6786f93f99463e4fa42e2d135f4 + sha512sums = ab6a698e9f2a125874fd952304ae2c0459ed39cbd0c194af02ae7ffd9560f74387e731c666a51aaf0762907ac6e5fac0aa18a4b6f69bd0f6642fe9d5f9bb19c1 pkgname = ceph-bin - depends = ceph-libs=17.2.5-4 + depends = ceph-libs=17.2.5-5 depends = boost-libs depends = curl depends = fuse3 @@ -42,7 +42,7 @@ pkgname = ceph-bin depends = gawk optdepends = smartmontools: disk monitoring via S.M.A.R.T optdepends = nvme-cli: disk monitoring for NVMe drives - provides = ceph=17.2.5-4 + provides = ceph=17.2.5-5 conflicts = ceph backup = etc/logrotate.d/ceph backup = etc/udev/rules.d/50-ceph-rbd.rules @@ -72,12 +72,12 @@ pkgname = ceph-libs-bin depends = python-prettytable depends = python-yaml depends = python-setuptools - provides = ceph-libs=17.2.5-4 + provides = ceph-libs=17.2.5-5 conflicts = ceph-libs pkgname = ceph-mgr-bin - depends = ceph=17.2.5-4 - depends = ceph-libs=17.2.5-4 + depends = ceph=17.2.5-5 + depends = ceph-libs=17.2.5-5 depends = bash depends = boost-libs depends = curl @@ -107,7 +107,7 @@ pkgname = ceph-mgr-bin optdepends = python-kubernetes: rook module optdepends = python-prometheus_client: prometheus module optdepends = python-remoto: ssh module - provides = ceph-mgr=17.2.5-4 + provides = ceph-mgr=17.2.5-5 conflicts = ceph-mgr options = emptydirs options = !strip diff --git a/PKGBUILD b/PKGBUILD index 5fc88c8..a02e35a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgbase='ceph-bin' pkgname=('ceph-bin' 'ceph-libs-bin' 'ceph-mgr-bin') pkgver=17.2.5 -pkgrel=4 +pkgrel=5 pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system' arch=('x86_64') url='https://ceph.com/' @@ -13,9 +13,9 @@ _artifact=v${pkgver}-${pkgrel} source=("ceph-bin-${pkgver}-${pkgrel}.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/${_artifact}/ceph_linux_${arch}.tar.zstd" "ceph-libs-bin-${pkgver}-${pkgrel}.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/${_artifact}/ceph_libs_linux_${arch}.tar.zstd" "ceph-mgr-bin-${pkgver}-${pkgrel}.tar.zst::https://github.com/bazaah/aur-ceph/releases/download/${_artifact}/ceph_mgr_linux_${arch}.tar.zstd") -sha512sums=('1771dd508a329a7a379b3023d6c538719eef29b3534d967e545a55f4e6cd5c84456bbf823ab91c394c90e64eb42213a1a28c96c8c1d632240e2f5415ba8401c0' - 'ad068ef3c4e7dcfeafd18855450b2a1fa19bc22bc4036ba1ca32bbf97e44cebd54ba701e25b165b217448af5d35ba5f48cbadd3d7a6bf084bd17d4f54c400ac7' - '4e0cfe0c17a092aa320cc025a7aff9544c7f94c5bd80ab8de2498eb1a81235a620096fcada82301efce51d8d69b53500e65d7feb22fca91524972ef91413d7ae') +sha512sums=('15cfadd37b088791e4fe240fdcb15471e952f740722e9d20a9ea535de5e82acb59bdcf42de4b94bc694948469c2a8ea442b8157670c5ec94c2e617a86a0ac43f' + '445bf7563f3b14c34e79fcee902905c89dc52bd6a5871384e3d9bddbfc8e101c1c23da41695e21e4faef49841023ffd73a18a6786f93f99463e4fa42e2d135f4' + 'ab6a698e9f2a125874fd952304ae2c0459ed39cbd0c194af02ae7ffd9560f74387e731c666a51aaf0762907ac6e5fac0aa18a4b6f69bd0f6642fe9d5f9bb19c1') # Don't extract source archives noextract=("${source[@]%%::*}")