testing/ceph: APKBUILD cleanups

2 files changed, 89 insertions, 113 deletions

diff --git a/testing/ceph/APKBUILD b/testing/ceph/APKBUILD
index b2beecf0a2..8303e35e89 100644
--- a/testing/ceph/APKBUILD
+++ b/testing/ceph/APKBUILD
@@ -5,31 +5,21 @@
 
 pkgname=ceph
 pkgver=11.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="User space components of the Ceph file system"
 pkgusers="ceph"
 pkggroups="ceph"
 url="http://ceph.com"
 arch="x86_64"
 license="LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT"
-depends="
-	ceph-osd
-	ceph-mds
-	ceph-mon
-	binutils
-"
+depends="ceph-osd ceph-mds ceph-mon"
 
 makedepends="
-	autoconf
-	automake
 	acl-dev
 	argp-standalone
-	binutils
 	boost-dev
 	btrfs-progs
-	build-base
 	bzip2-dev
-	ccache
 	cmake
 	coreutils
 	cryptsetup
@@ -44,7 +34,6 @@ makedepends="
 	flex
 	fuse-dev
 	git
-	grep
 	jq
 	keyutils-dev
 	leveldb-dev
@@ -68,7 +57,6 @@ makedepends="
 	py-virtualenv
 	readline-dev
 	rpcgen
-	sed
 	snappy-dev
 	userspace-rcu-dev
 	xfsprogs-dev
@@ -76,22 +64,8 @@ makedepends="
 	yasm
 "
 
-case $pkgrel in
-	''|*[!0-9]*)
-		_builddir="$srcdir"/$pkgname-$pkgver-`echo $pkgrel | sed 's/\./-/'`
-		_sourcepkg=ceph-$pkgver-`echo $pkgrel | sed 's/\./-/'`.tar.bz2
-		;;
-	*)
-		_builddir="$srcdir"/$pkgname-$pkgver
-		_sourcepkg="http://github.com/dx9/ceph/releases/download/$pkgver/$pkgname-$pkgver-beta1.tar.bz2"
-		;;
-esac
-
-source="
-	$_sourcepkg
-	$pkgname-common.post-deinstall
-	$pkgname-common.pre-install
-"
+#source="$pkgname-$pkgver.tar.gz::https://github.com/ceph/ceph/archive/v$pkgver.tar.gz"
+source="https://github.com/dx9/ceph/releases/download/11.0.1/ceph-$pkgver-beta1.tar.bz2"
 
 subpackages="
 	$pkgname-base
@@ -140,6 +114,9 @@ _sysconfdir=/etc
 _udevrulesdir=/etc/udev/rules.d
 _python_sitelib=/usr/lib/python2.7/site-packages
 
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
 build() {
    cd "$_builddir"
    mkdir build
@@ -156,7 +133,8 @@ build() {
 	   -DWITH_THREAD_SAFE_RES_QUERY=ON \
 	   -DWITH_MANPAGE=OFF \
 	   -DWITH_PYTHON3=OFF \
-	   -DWITH_TESTS=$WITH_TESTS
+	   -DWITH_TESTS=$WITH_TESTS \
+	   || return 1
    make
 }
 
@@ -177,8 +155,10 @@ package() {
 
 	# udev rules
 	install -m 0644 -D udev/50-rbd.rules "$pkgdir"$_udevrulesdir/50-rbd.rules
-	install -m 0644 -D udev/60-ceph-by-parttypeuuid.rules  "$pkgdir"$_udevrulesdir/60-ceph-by-parttypeuuid.rules
-	install -m 0644 -D udev/95-ceph-osd.rules "$pkgdir"$_udevrulesdir/95-ceph-osd.rules
+	install -m 0644 -D udev/60-ceph-by-parttypeuuid.rules  \
+		"$pkgdir"$_udevrulesdir/60-ceph-by-parttypeuuid.rules
+	install -m 0644 -D udev/95-ceph-osd.rules \
+		"$pkgdir"$_udevrulesdir/95-ceph-osd.rules
 }
 
 base() {
@@ -187,7 +167,6 @@ base() {
 		ceph-common
 		cryptsetup
 		findutils
-		grep
 		librbd
 		librados
 		libcephfs
@@ -196,20 +175,19 @@ base() {
 		py-requests
 		py-setuptools
 		util-linux
-		which
 		xfsprogs
 	"
 
 	mkdir -p "$subpkgdir"$_docdir/ceph
-	mv "$pkgdir"$_docdir/ceph/sample.ceph.conf "$subpkgdir"$_docdir/ceph/sample.ceph.conf
-	mv "$pkgdir"$_docdir/ceph/sample.fetch_config "$subpkgdir"$_docdir/ceph/sample.fetch_config
+	mv "$pkgdir"$_docdir/ceph/sample.ceph.conf \
+		"$subpkgdir"$_docdir/ceph/sample.ceph.conf
+	mv "$pkgdir"$_docdir/ceph/sample.fetch_config \
+		"$subpkgdir"$_docdir/ceph/sample.fetch_config
 
 	mkdir -p "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/crushtool "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/monmaptool "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/osdmaptool "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-run "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-detect-init "$subpkgdir"$_bindir
+	for file in crushtool monmaptool osdmaptool ceph-run ceph-detect-init; do
+		mv "$pkgdir"$_bindir/$file "$subpkgdir"$_bindir
+	done
 
 	mkdir -p "$subpkgdir"$_sbindir
 	mv "$pkgdir"$_sbindir/ceph-create-keys "$subpkgdir"$_sbindir/ceph-create-keys
@@ -221,49 +199,53 @@ base() {
 	mkdir -p "$subpkgdir"$_libdir/rados-classes
 	mv "$pkgdir"$_libdir/rados-classes/* "$subpkgdir"$_libdir/rados-classes
 	mkdir -p "$subpkgdir"$_libdir/ceph/erasure-code
-	mv "$pkgdir"$_libdir/ceph/erasure-code/libec_*.so* "$subpkgdir"$_libdir/ceph/erasure-code
+	mv "$pkgdir"$_libdir/ceph/erasure-code/libec_*.so* \
+		"$subpkgdir"$_libdir/ceph/erasure-code
 	mkdir -p "$subpkgdir"$_libdir/ceph/compressor
-	mv "$pkgdir"$_libdir/ceph/compressor/libceph_*.so* "$subpkgdir"$_libdir/ceph/compressor
+	mv "$pkgdir"$_libdir/ceph/compressor/libceph_*.so* \
+		"$subpkgdir"$_libdir/ceph/compressor
 
 	mkdir -p "$subpkgdir"$_sysconfdir/logrotate.d
-	mv "$pkgdir"$_sysconfdir/logrotate.d/ceph "$subpkgdir"$_sysconfdir/logrotate.d/ceph
+	mv "$pkgdir"$_sysconfdir/logrotate.d/ceph \
+		"$subpkgdir"$_sysconfdir/logrotate.d/ceph
 
 	mkdir -p "$subpkgdir"$_python_sitelib
 	mv "$pkgdir"$_python_sitelib/ceph_detect_init* "$subpkgdir"$_python_sitelib
 	mv "$pkgdir"$_python_sitelib/ceph_disk* "$subpkgdir"$_python_sitelib
 
-	install -m 750 -o ceph -g ceph -d "$subpkgdir"$_localstatedir/lib/ceph/tmp
-	install -m 750 -o ceph -g ceph -d "$subpkgdir"$_localstatedir/lib/ceph/bootstrap-osd
-	install -m 750 -o ceph -g ceph -d "$subpkgdir"$_localstatedir/lib/ceph/bootstrap-mds
-	install -m 750 -o ceph -g ceph -d "$subpkgdir"$_localstatedir/lib/ceph/bootstrap-rgw
+	for dir in tmp bootstrap-osd bootstrap-mds bootstrap-rgw; do
+		install -m 750 -o ceph -g ceph -d \
+			"$subpkgdir"$_localstatedir/lib/ceph/$dir
+	done
 }
 
 common() {
 	pkgdesc="Common utilities to mount and interact with a ceph storage cluster."
 	depends="py-rados py-rbd py-cephfs"
-	install="
-		$pkgname-common.pre-install
-		$pkgname-common.post-deinstall
-	"
+	install="$pkgname-common.pre-install"
 
 	mkdir -p "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-authtool "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-conf "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-dencoder "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-rbdnamer "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-syn "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-crush-location "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/cephfs-data-scan "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/cephfs-journal-tool "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/cephfs-table-tool "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/rados "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/rbd "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/rbd-replay "$subpkgdir"$_bindir/rbd-replay
-	mv "$pkgdir"$_bindir/rbd-replay-many "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/rbdmap "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-post-file "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-brag "$subpkgdir"$_bindir
+	for file in \
+		ceph \
+		ceph-authtool \
+		ceph-conf \
+		ceph-dencoder \
+		ceph-rbdnamer \
+		ceph-syn \
+		ceph-crush-location \
+		cephfs-data-scan \
+		cephfs-journal-tool \
+		cephfs-table-tool \
+		rados \
+		rdb \
+		rbd-replay \
+		rbd-replay-many \
+		rbdmap \
+		ceph-post-file \
+		ceph-brag \
+		; do \
+		mv "$pkgdir"$_bindir/$file "$subpkgdir"$_bindir
+	done
 
 	mkdir -p "$subpkgdir"$_datadir/ceph
 	mv "$pkgdir"$_datadir/ceph/known_hosts_drop.ceph.com "$subpkgdir"$_datadir/ceph
@@ -489,36 +471,40 @@ py_cephfs() {
 ceph_test() {
 	depends="ceph-common"
 	mkdir -p "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_bench_log "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_kvstorebench "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_multi_stress_watch "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_erasure_code "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_erasure_code_benchmark "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_omapbench "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_objectstore_bench "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_perf_objectstore "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_perf_local "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_perf_msgr_client "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_perf_msgr_server "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_psim "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_radosacl "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_rgw_jsonparser "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_rgw_multiparser "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_scratchtool "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_scratchtoolpp "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_smalliobench "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_smalliobenchdumb "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_smalliobenchfs "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_smalliobenchrbd "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_test_* "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_tpbench "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph_xattr_bench "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-coverage "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-monstore-tool "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-osdomap-tool "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-kvstore-tool "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-debugpack "$subpkgdir"$_bindir
-	mv "$pkgdir"$_bindir/ceph-client-debug "$subpkgdir"$_bindir
+	for file in \
+		ceph_bench_log \
+		ceph_kvstorebench \
+		ceph_multi_stress_watch \
+		ceph_erasure_code \
+		ceph_erasure_code_benchmark \
+		ceph_omapbench \
+		ceph_objectstore_bench \
+		ceph_perf_objectstore \
+		ceph_perf_local \
+		ceph_perf_msgr_client \
+		ceph_perf_msgr_server \
+		ceph_psim \
+		ceph_radosacl \
+		ceph_rgw_jsonparser \
+		ceph_rgw_multiparser \
+		ceph_scratchtool \
+		ceph_scratchtoolpp \
+		ceph_smalliobench \
+		ceph_smalliobenchdumb \
+		ceph_smalliobenchfs \
+		ceph_smalliobenchrbd \
+		ceph_test_* \
+		ceph_tpbench \
+		ceph_xattr_bench \
+		ceph-coverage \
+		ceph-monstore-tool \
+		ceph-osdomap-tool \
+		ceph-kvstore-tool \
+		ceph-debugpack \
+		ceph-client-debug \
+		; do \
+		mv "$pkgdir"$_bindir/$file "$subpkgdir"$_bindir
+	done
 
 	mkdir -p "$subpkgdir"$_libdir
 	mv "$pkgdir"$_libdir/ceph/ceph-monstore-update-crush.sh "$subpkgdir"$_libdir
@@ -530,12 +516,6 @@ bash_completion() {
 	mkdir -p "$subpkgdir"$_sysconfdir/bash_completion.d
 	mv "$pkgdir"$_sysconfdir/bash_completion.d/* "$subpkgdir"$_sysconfdir/bash_completion.d
 }
-md5sums="edae3d83b4dd0f1316bdc0799ea61769  ceph-11.0.1-beta1.tar.bz2
-f26417b85918f219ad1d68e300c5ab33  ceph-common.post-deinstall
-97b80cd338165e4949561d573341aec6  ceph-common.pre-install"
-sha256sums="fedaff78cd590021087edf168c0649505880cfbd73cde4029933b823f5ac617f  ceph-11.0.1-beta1.tar.bz2
-c15d3a2b3a2f78c6ae51c80f7c4ad00c44604050f32c469dcafc41ee2ac2a3d3  ceph-common.post-deinstall
-b0e17f2842d3f755949875edbbbd047ba4bd231bca6305cea874083abb382600  ceph-common.pre-install"
-sha512sums="d8bc28a25b9444134527f22856a6f0ea97b21a6100b0576a092d8988da0f191aca1e59bd14129361aee53f3032295169117ff02207e2ff361bb526461b9c5462  ceph-11.0.1-beta1.tar.bz2
-c892133fe981476d579d1a67d66f6e34fa43dc9135b7ef9caafe8f421841fdff417db465ec8d0e37c39df7cf233553fbf70817d5448e2dcd42b6cc63bdff2b2e  ceph-common.post-deinstall
-10dd94274f086a09e6b2719bdbdf9e59ec80f2b09d65c2f51f7cf42557d4ad796ea6d8eb0998dc804b04ea56ff26bc496702af712215bf990742e7d9f24c33d2  ceph-common.pre-install"
+md5sums="edae3d83b4dd0f1316bdc0799ea61769  ceph-11.0.1-beta1.tar.bz2"
+sha256sums="fedaff78cd590021087edf168c0649505880cfbd73cde4029933b823f5ac617f  ceph-11.0.1-beta1.tar.bz2"
+sha512sums="d8bc28a25b9444134527f22856a6f0ea97b21a6100b0576a092d8988da0f191aca1e59bd14129361aee53f3032295169117ff02207e2ff361bb526461b9c5462  ceph-11.0.1-beta1.tar.bz2"
diff --git a/testing/ceph/ceph-common.post-deinstall b/testing/ceph/ceph-common.post-deinstall
deleted file mode 100644
index 20edf576ac..0000000000
--- a/testing/ceph/ceph-common.post-deinstall
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -rf /var/log/ceph
-rm -rf /etc/ceph