aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuncan Bellamy <dunk@denkimushi.com>2022-09-24 14:54:47 +0000
committeralice <alice@ayaya.dev>2022-09-25 10:04:26 +0000
commitba8f0d3c154095c572891b2bb13ade3bc2c5fc60 (patch)
tree0fd7710f9fc19ffad3fb5ee8edb3022243e8a266
parentbbaa7e90b27a0b0576dff6acc353685ea24567ab (diff)
downloadaports-ba8f0d3c154095c572891b2bb13ade3bc2c5fc60.tar.gz
aports-ba8f0d3c154095c572891b2bb13ade3bc2c5fc60.tar.bz2
aports-ba8f0d3c154095c572891b2bb13ade3bc2c5fc60.tar.xz
testing/ceph17: add py3-ceph17-common sub package with core ceph module
* make py3-ceph17-common depend on missing python deps * fix missing deps for ceph17-volume
-rw-r--r--testing/ceph17/APKBUILD16
1 files changed, 12 insertions, 4 deletions
diff --git a/testing/ceph17/APKBUILD b/testing/ceph17/APKBUILD
index 2f67cf64bc..ac2ff554bd 100644
--- a/testing/ceph17/APKBUILD
+++ b/testing/ceph17/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
_pkgname=ceph
pkgver=17.2.3
-pkgrel=6
+pkgrel=7
_majorver=${pkgver%%.*}
pkgname=$_pkgname$_majorver
pkgdesc="Ceph is a distributed object store and file system, version $_majorver"
@@ -27,7 +27,7 @@ _base_deps="
"
_osd_daemon_deps="fuse snappy lz4-libs"
_osd_tools_deps="lz4-libs"
-_ceph_volume_deps="lvm2"
+_ceph_volume_deps="$pkgname-common $pkgname-osd-tools lvm2 py3-$pkgname-common"
_ceph_test_deps="
gtest-dev
py3-coverage
@@ -179,6 +179,7 @@ subpackages="
libradosstriper$_majorver:libradosstriper
py3-rbd$_majorver:_py3_rbd
py3-cephfs$_majorver:_py3_cephfs
+ py3-$pkgname-common:_py3_ceph_common
"
_ceph_uid=167
@@ -327,7 +328,7 @@ base() {
common() {
pkgdesc="Common utilities to mount and interact with a ceph storage cluster."
- depends="py3-rados$_majorver py3-rbd$_majorver py3-cephfs$_majorver py3-prettytable"
+ depends="eudev py3-rados$_majorver py3-rbd$_majorver py3-cephfs$_majorver py3-prettytable"
amove usr/bin/ceph \
usr/bin/ceph-authtool \
@@ -468,7 +469,7 @@ librados() {
_py3_rados() {
pkgdesc="Python libraries for the RADOS object store"
- depends=
+ depends=py3-$pkgname-common
amove "$(_py3_sitelib)"/rados*
}
@@ -530,6 +531,13 @@ _py3_cephfs() {
amove "$(_py3_sitelib)"/cephfs*
}
+_py3_ceph_common() {
+ pkgdesc="Python dependencies for $pkgname distributed file system"
+ depends="py3-setuptools py3-yaml"
+
+ amove "$(_py3_sitelib)"/ceph-*.egg-info "$(_py3_sitelib)"/ceph
+}
+
utils() {
pkgdesc="Ceph utils and recovery tools"
depends="$pkgname-common=$pkgver-r$pkgrel"