Date: Monday, August 22, 2016 @ 20:14:18 Author: seblu Revision: 274588
archrelease: copy trunk to staging-x86_64, staging-i686 Added: ceph/repos/staging-i686/ ceph/repos/staging-i686/01-virtualenv2.patch (from rev 274587, ceph/trunk/01-virtualenv2.patch) ceph/repos/staging-i686/02-setup-python2.patch (from rev 274587, ceph/trunk/02-setup-python2.patch) ceph/repos/staging-i686/PKGBUILD (from rev 274587, ceph/trunk/PKGBUILD) ceph/repos/staging-i686/ceph.install (from rev 274587, ceph/trunk/ceph.install) ceph/repos/staging-i686/ceph.sysusers (from rev 274587, ceph/trunk/ceph.sysusers) ceph/repos/staging-x86_64/ ceph/repos/staging-x86_64/01-virtualenv2.patch (from rev 274587, ceph/trunk/01-virtualenv2.patch) ceph/repos/staging-x86_64/02-setup-python2.patch (from rev 274587, ceph/trunk/02-setup-python2.patch) ceph/repos/staging-x86_64/PKGBUILD (from rev 274587, ceph/trunk/PKGBUILD) ceph/repos/staging-x86_64/ceph.install (from rev 274587, ceph/trunk/ceph.install) ceph/repos/staging-x86_64/ceph.sysusers (from rev 274587, ceph/trunk/ceph.sysusers) ---------------------------------------+ staging-i686/01-virtualenv2.patch | 11 ++++ staging-i686/02-setup-python2.patch | 38 +++++++++++++ staging-i686/PKGBUILD | 87 ++++++++++++++++++++++++++++++++ staging-i686/ceph.install | 16 +++++ staging-i686/ceph.sysusers | 1 staging-x86_64/01-virtualenv2.patch | 11 ++++ staging-x86_64/02-setup-python2.patch | 38 +++++++++++++ staging-x86_64/PKGBUILD | 87 ++++++++++++++++++++++++++++++++ staging-x86_64/ceph.install | 16 +++++ staging-x86_64/ceph.sysusers | 1 10 files changed, 306 insertions(+) Copied: ceph/repos/staging-i686/01-virtualenv2.patch (from rev 274587, ceph/trunk/01-virtualenv2.patch) =================================================================== --- staging-i686/01-virtualenv2.patch (rev 0) +++ staging-i686/01-virtualenv2.patch 2016-08-22 20:14:18 UTC (rev 274588) @@ -0,0 +1,11 @@ +--- a/src/tools/setup-virtualenv.sh 2016-06-14 13:43:58.000000000 +0200 ++++ b/src/tools/setup-virtualenv.sh 2016-08-18 02:13:31.418624320 +0200 +@@ -18,7 +18,7 @@ + DIR=$1 + rm -fr $DIR + mkdir -p $DIR +-virtualenv --python python2.7 $DIR ++virtualenv2 --python python2.7 $DIR + . $DIR/bin/activate + # older versions of pip will not install wrap_console scripts + # when using wheel packages Copied: ceph/repos/staging-i686/02-setup-python2.patch (from rev 274587, ceph/trunk/02-setup-python2.patch) =================================================================== --- staging-i686/02-setup-python2.patch (rev 0) +++ staging-i686/02-setup-python2.patch 2016-08-22 20:14:18 UTC (rev 274588) @@ -0,0 +1,38 @@ +--- a/src/Makefile.in 2016-06-14 13:44:59.000000000 +0200 ++++ b/src/Makefile.in 2016-08-19 22:09:15.526703376 +0200 +@@ -32623,7 +32623,7 @@ + cd $(srcdir)/ceph-detect-init ; ../tools/setup-virtualenv.sh ${CEPH_DETECT_INIT_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e . + + ceph-detect-init-clean: +- cd $(srcdir)/ceph-detect-init ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DETECT_INIT_VIRTUALENV} .coverage *.egg-info ++ cd $(srcdir)/ceph-detect-init ; python2 setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DETECT_INIT_VIRTUALENV} .coverage *.egg-info + + ceph-detect-init-install-data: + cd $(srcdir)/ceph-detect-init ; \ +@@ -32635,7 +32635,7 @@ + fi ; \ + root="--root=$(DESTDIR)" ; \ + fi ; \ +- python setup.py install $$root $$options ++ python2 setup.py install $$root $$options + + export CEPH_DISK_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv + +@@ -32645,7 +32645,7 @@ + cd $(srcdir)/ceph-disk ; ../tools/setup-virtualenv.sh ${CEPH_DISK_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DISK_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e . + + ceph-disk-clean: +- cd $(srcdir)/ceph-disk ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DISK_VIRTUALENV} .coverage *.egg-info ++ cd $(srcdir)/ceph-disk ; python2 setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DISK_VIRTUALENV} .coverage *.egg-info + + ceph-disk-install-data: + cd $(srcdir)/ceph-disk ; \ +@@ -32657,7 +32657,7 @@ + fi ; \ + root="--root=$(DESTDIR) --install-script=/usr/sbin" ; \ + fi ; \ +- python setup.py install $$root $$options ++ python2 setup.py install $$root $$options + + #crush_includedir = $(includedir)/crush + #crush_include_DATA = \ Copied: ceph/repos/staging-i686/PKGBUILD (from rev 274587, ceph/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2016-08-22 20:14:18 UTC (rev 274588) @@ -0,0 +1,87 @@ +# $Id$ +# Maintainer: Sébastien "Seblu" Luttringer <se...@archlinux.org> + +pkgname=ceph +pkgver=10.2.2 +pkgrel=2 +pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system' +arch=('x86_64' 'i686') +url='http://ceph.com/' +license=('GPL') +makedepends=('boost' 'systemd' 'xfsprogs' 'python2-setuptools' 'python2-sphinx' + 'python2-virtualenv' 'cython2') +depends=('boost-libs' 'curl' 'expat' 'fcgi' 'fuse' 'gcc-libs' 'glibc' + 'gperftools' 'keyutils' 'leveldb' 'libaio' 'libatomic_ops' 'libedit' + 'libsystemd' 'libutil-linux' 'ncurses' 'nss' 'python2' 'snappy') +optdepends=('xfsprogs: support xfs backend') +options=('emptydirs') +install=ceph.install +source=("http://ceph.com/download/$pkgname-$pkgver.tar.gz" + 'ceph.sysusers' + '01-virtualenv2.patch' + '02-setup-python2.patch') +md5sums=('5cba47af53b3b17002aad3c854e5405c' + 'b3e24e3aa005a657ab475f84bfe3291a' + 'a3f72dc8e97f9fd5708d52256bcd9e75' + 'f11582acceeb6c1790518c3a5a29bb18') + +prepare() { + cd $pkgname-$pkgver + # apply patch from the source array (should be a pacman feature) + local filename + for filename in "${source[@]}"; do + if [[ "$filename" =~ \.patch$ ]]; then + msg2 "Applying patch $filename" + patch -p1 -N -i "$srcdir/$filename" + fi + done + : +} + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-man-pages \ + --with-radosgw \ + --without-openldap \ + PYTHON=/usr/bin/python2 \ + CYTHON_CHECK=yes \ + PYTHON_CONFIG_CHECK=yes \ + SPHINX_BUILD=sphinx-build2 + make +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install + + # install tmpfiles.d + install -Dm644 systemd/ceph.tmpfiles.d "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" + install -Dm644 "$srcdir"/ceph.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" + + cd "$pkgdir" + + # fix sbin path + msg2 'Fix sbin paths' + mv -v sbin/* usr/sbin/* usr/bin + rmdir -v sbin usr/sbin + + # fix bash completions path + msg2 'Fix bash completion path' + install -d -m 755 usr/share/bash-completion + mv etc/bash_completion.d usr/share/bash-completion/completions + + # fix python2 shebang, did not do it in prepare() anymore because it + # confuse automake + msg2 'Fix python2 shebang' + find . -type f -executable -exec \ + sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; +} + +# vim:set ts=2 sw=2 et: Copied: ceph/repos/staging-i686/ceph.install (from rev 274587, ceph/trunk/ceph.install) =================================================================== --- staging-i686/ceph.install (rev 0) +++ staging-i686/ceph.install 2016-08-22 20:14:18 UTC (rev 274588) @@ -0,0 +1,16 @@ +# vim: ft=sh ts=2 sw=2 et: + +# arg 1: the new package version +post_install() { + systemd-sysusers ceph.conf + systemd-tmpfiles --create ceph.conf +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if (( "$(vercmp $2 '10.2.2-1')" < 0 )); then + systemd-sysusers ceph.conf + systemd-tmpfiles --create ceph.conf + fi +} Copied: ceph/repos/staging-i686/ceph.sysusers (from rev 274587, ceph/trunk/ceph.sysusers) =================================================================== --- staging-i686/ceph.sysusers (rev 0) +++ staging-i686/ceph.sysusers 2016-08-22 20:14:18 UTC (rev 274588) @@ -0,0 +1 @@ +u ceph - - /run/ceph Copied: ceph/repos/staging-x86_64/01-virtualenv2.patch (from rev 274587, ceph/trunk/01-virtualenv2.patch) =================================================================== --- staging-x86_64/01-virtualenv2.patch (rev 0) +++ staging-x86_64/01-virtualenv2.patch 2016-08-22 20:14:18 UTC (rev 274588) @@ -0,0 +1,11 @@ +--- a/src/tools/setup-virtualenv.sh 2016-06-14 13:43:58.000000000 +0200 ++++ b/src/tools/setup-virtualenv.sh 2016-08-18 02:13:31.418624320 +0200 +@@ -18,7 +18,7 @@ + DIR=$1 + rm -fr $DIR + mkdir -p $DIR +-virtualenv --python python2.7 $DIR ++virtualenv2 --python python2.7 $DIR + . $DIR/bin/activate + # older versions of pip will not install wrap_console scripts + # when using wheel packages Copied: ceph/repos/staging-x86_64/02-setup-python2.patch (from rev 274587, ceph/trunk/02-setup-python2.patch) =================================================================== --- staging-x86_64/02-setup-python2.patch (rev 0) +++ staging-x86_64/02-setup-python2.patch 2016-08-22 20:14:18 UTC (rev 274588) @@ -0,0 +1,38 @@ +--- a/src/Makefile.in 2016-06-14 13:44:59.000000000 +0200 ++++ b/src/Makefile.in 2016-08-19 22:09:15.526703376 +0200 +@@ -32623,7 +32623,7 @@ + cd $(srcdir)/ceph-detect-init ; ../tools/setup-virtualenv.sh ${CEPH_DETECT_INIT_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e . + + ceph-detect-init-clean: +- cd $(srcdir)/ceph-detect-init ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DETECT_INIT_VIRTUALENV} .coverage *.egg-info ++ cd $(srcdir)/ceph-detect-init ; python2 setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DETECT_INIT_VIRTUALENV} .coverage *.egg-info + + ceph-detect-init-install-data: + cd $(srcdir)/ceph-detect-init ; \ +@@ -32635,7 +32635,7 @@ + fi ; \ + root="--root=$(DESTDIR)" ; \ + fi ; \ +- python setup.py install $$root $$options ++ python2 setup.py install $$root $$options + + export CEPH_DISK_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv + +@@ -32645,7 +32645,7 @@ + cd $(srcdir)/ceph-disk ; ../tools/setup-virtualenv.sh ${CEPH_DISK_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DISK_VIRTUALENV}/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e . + + ceph-disk-clean: +- cd $(srcdir)/ceph-disk ; python setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DISK_VIRTUALENV} .coverage *.egg-info ++ cd $(srcdir)/ceph-disk ; python2 setup.py clean ; rm -fr wheelhouse .tox build ${CEPH_DISK_VIRTUALENV} .coverage *.egg-info + + ceph-disk-install-data: + cd $(srcdir)/ceph-disk ; \ +@@ -32657,7 +32657,7 @@ + fi ; \ + root="--root=$(DESTDIR) --install-script=/usr/sbin" ; \ + fi ; \ +- python setup.py install $$root $$options ++ python2 setup.py install $$root $$options + + #crush_includedir = $(includedir)/crush + #crush_include_DATA = \ Copied: ceph/repos/staging-x86_64/PKGBUILD (from rev 274587, ceph/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2016-08-22 20:14:18 UTC (rev 274588) @@ -0,0 +1,87 @@ +# $Id$ +# Maintainer: Sébastien "Seblu" Luttringer <se...@archlinux.org> + +pkgname=ceph +pkgver=10.2.2 +pkgrel=2 +pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system' +arch=('x86_64' 'i686') +url='http://ceph.com/' +license=('GPL') +makedepends=('boost' 'systemd' 'xfsprogs' 'python2-setuptools' 'python2-sphinx' + 'python2-virtualenv' 'cython2') +depends=('boost-libs' 'curl' 'expat' 'fcgi' 'fuse' 'gcc-libs' 'glibc' + 'gperftools' 'keyutils' 'leveldb' 'libaio' 'libatomic_ops' 'libedit' + 'libsystemd' 'libutil-linux' 'ncurses' 'nss' 'python2' 'snappy') +optdepends=('xfsprogs: support xfs backend') +options=('emptydirs') +install=ceph.install +source=("http://ceph.com/download/$pkgname-$pkgver.tar.gz" + 'ceph.sysusers' + '01-virtualenv2.patch' + '02-setup-python2.patch') +md5sums=('5cba47af53b3b17002aad3c854e5405c' + 'b3e24e3aa005a657ab475f84bfe3291a' + 'a3f72dc8e97f9fd5708d52256bcd9e75' + 'f11582acceeb6c1790518c3a5a29bb18') + +prepare() { + cd $pkgname-$pkgver + # apply patch from the source array (should be a pacman feature) + local filename + for filename in "${source[@]}"; do + if [[ "$filename" =~ \.patch$ ]]; then + msg2 "Applying patch $filename" + patch -p1 -N -i "$srcdir/$filename" + fi + done + : +} + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-man-pages \ + --with-radosgw \ + --without-openldap \ + PYTHON=/usr/bin/python2 \ + CYTHON_CHECK=yes \ + PYTHON_CONFIG_CHECK=yes \ + SPHINX_BUILD=sphinx-build2 + make +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install + + # install tmpfiles.d + install -Dm644 systemd/ceph.tmpfiles.d "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" + install -Dm644 "$srcdir"/ceph.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" + + cd "$pkgdir" + + # fix sbin path + msg2 'Fix sbin paths' + mv -v sbin/* usr/sbin/* usr/bin + rmdir -v sbin usr/sbin + + # fix bash completions path + msg2 'Fix bash completion path' + install -d -m 755 usr/share/bash-completion + mv etc/bash_completion.d usr/share/bash-completion/completions + + # fix python2 shebang, did not do it in prepare() anymore because it + # confuse automake + msg2 'Fix python2 shebang' + find . -type f -executable -exec \ + sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; +} + +# vim:set ts=2 sw=2 et: Copied: ceph/repos/staging-x86_64/ceph.install (from rev 274587, ceph/trunk/ceph.install) =================================================================== --- staging-x86_64/ceph.install (rev 0) +++ staging-x86_64/ceph.install 2016-08-22 20:14:18 UTC (rev 274588) @@ -0,0 +1,16 @@ +# vim: ft=sh ts=2 sw=2 et: + +# arg 1: the new package version +post_install() { + systemd-sysusers ceph.conf + systemd-tmpfiles --create ceph.conf +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if (( "$(vercmp $2 '10.2.2-1')" < 0 )); then + systemd-sysusers ceph.conf + systemd-tmpfiles --create ceph.conf + fi +} Copied: ceph/repos/staging-x86_64/ceph.sysusers (from rev 274587, ceph/trunk/ceph.sysusers) =================================================================== --- staging-x86_64/ceph.sysusers (rev 0) +++ staging-x86_64/ceph.sysusers 2016-08-22 20:14:18 UTC (rev 274588) @@ -0,0 +1 @@ +u ceph - - /run/ceph