diff options
| -rw-r--r-- | community/ceph/APKBUILD (renamed from testing/ceph/APKBUILD) | 30 | ||||
| -rw-r--r-- | community/ceph/allperms.patch (renamed from testing/ceph/allperms.patch) | 0 | ||||
| -rw-r--r-- | community/ceph/ceph-common.pre-install (renamed from testing/ceph/ceph-common.pre-install) | 0 | ||||
| -rw-r--r-- | community/ceph/musl-fixes.patch (renamed from testing/ceph/musl-fixes.patch) | 0 |
4 files changed, 23 insertions, 7 deletions
diff --git a/testing/ceph/APKBUILD b/community/ceph/APKBUILD index c8999328f4..ec1801f07a 100644 --- a/testing/ceph/APKBUILD +++ b/community/ceph/APKBUILD @@ -1,7 +1,7 @@ # Contributor: John Coyle <dx9err@gmail.com> # Maintainer: John Coyle <dx9err@gmail.com> pkgname=ceph -pkgver=14.1.0 +pkgver=14.2.0 pkgrel=3 pkgdesc="Ceph is a distributed object store and file system" pkgusers="ceph" @@ -20,7 +20,7 @@ _base_deps=" util-linux xfsprogs " -_osd_deps="lvm2 sudo" +_osd_deps="lvm2 sudo lz4-libs" _ceph_test_deps="xmlstarlet" makedepends=" acl-dev @@ -43,6 +43,7 @@ makedepends=" fuse-dev git grep + gperf jq keyutils-dev leveldb-dev @@ -56,7 +57,9 @@ makedepends=" linux-headers lvm2-dev lz4-dev + nodejs nss-dev + oath-toolkit-dev openldap-dev procps python2-dev @@ -90,6 +93,7 @@ subpackages=" $pkgname-mon $pkgname-fuse:ceph_fuse $pkgname-osd + $pkgname-radosgw $pkgname-bash-completion:bash_completion $pkgname-dev rbd-fuse:rbd_fuse @@ -132,6 +136,7 @@ build() { cd "$builddir"/build cmake .. \ + -DALLOCATOR=libc \ -DCMAKE_INSTALL_PREFIX=$_prefix \ -DCMAKE_INSTALL_LIBDIR=$_libdir \ -DCMAKE_INSTALL_LIBEXECDIR=$_libexecdir \ @@ -148,11 +153,11 @@ build() { -DMGR_PYTHON_VERSION=2 \ -DWITH_LTTNG=OFF \ -DWITH_RDMA=OFF \ - -DWITH_RADOSGW=OFF \ -DWITH_BABELTRACE=OFF \ -DWITH_SYSTEMD=OFF \ - -DWITH_EMBEDDED=OFF \ - -DWITH_MGR_DASHBOARD_FRONTEND=OFF \ + -DWITH_SPDK=OFF \ + -DWITH_BABELTRACE=OFF \ + -DWITH_RADOSGW_AMQP_ENDPOINT=OFF \ -DWITH_TESTS=OFF make @@ -294,6 +299,17 @@ rbd_nbd() { _pkg $_bindir rbd-nbd } +radosgw() { + pkgdesc="Rados REST gateway which implements Amazon's S3 and OpenStack's Swift APIs." + depends="ceph-common oath-toolkit-liboath" + _pkg $_bindir radosgw \ + radosgw-admin \ + radosgw-es \ + radosgw-object-expirer \ + radosgw-token + mkdir -p "$subpkgdir"$_localstatedir/lib/ceph/radosgw +} + osd() { pkgdesc="Object storage daemon for the Ceph distributed file system." depends="$pkgname-base=$pkgver-r$pkgrel $_osd_deps" @@ -303,7 +319,7 @@ osd() { ceph-objectstore-tool \ ceph-osdomap-tool \ ceph-osd - _pkg $_sbindir ceph-volume ceph-volume-systemd + _pkg $_sbindir ceph-volume _pkg $_libexecdir/ceph ceph-osd-prestart.sh _pkg $_sysconfdir/sudoers.d ceph-osd-smartctl _pkg $_sysconfdir/sysctl.d 90-ceph-osd.conf @@ -427,6 +443,6 @@ _pkg() { done } -sha512sums="902eb4b0b56f864eace3aaf5684b113a05875f7a8d081b45801a73cd883b35b60bcff5f7580727672839e2e68abe1bd0b73e2be4ca44ccde162cd1ce679ab313 ceph_14.1.0.orig.tar.gz +sha512sums="c86a335714fd5678988133ec0e60cb10cd948250a133c073d1ed055c5bba232fa6f1e102dd7fcb0c70b37a07c9c2d1220d4a1713720e4dcab9659152ee577480 ceph_14.2.0.orig.tar.gz e1becd813ed3f28e2e4a6bef78b3b5117c1c0bb9cabe0ba9c912e0a20b551b6b2667495cddb94acd64192e287144911ff1c11e0d636fe04cc458146cfb0daca8 allperms.patch 35722b11ad52a3145153635b6a96abda2a23ae9c7e63e2eac006c1e5b8014452c4a1a11bbe0292fd731e4c43aa38e27dd75d2ff9d25bcf52290278f71e868570 musl-fixes.patch" diff --git a/testing/ceph/allperms.patch b/community/ceph/allperms.patch index a5ce1c031d..a5ce1c031d 100644 --- a/testing/ceph/allperms.patch +++ b/community/ceph/allperms.patch diff --git a/testing/ceph/ceph-common.pre-install b/community/ceph/ceph-common.pre-install index bae4f09dc7..bae4f09dc7 100644 --- a/testing/ceph/ceph-common.pre-install +++ b/community/ceph/ceph-common.pre-install diff --git a/testing/ceph/musl-fixes.patch b/community/ceph/musl-fixes.patch index 6e50e6ba5b..6e50e6ba5b 100644 --- a/testing/ceph/musl-fixes.patch +++ b/community/ceph/musl-fixes.patch |