[arch-commits] Commit in ceph/trunk (6 files)
Sébastien Luttringer
seblu at archlinux.org
Sun May 31 15:35:47 UTC 2015
Date: Sunday, May 31, 2015 @ 17:35:47
Author: seblu
Revision: 239964
ceph 0.94.1-0.2
- Go back to 0.94.1; 9.{0,1].x are dev versions
- Fix boost 1.58 broken build with 0.94.1
- Cleanup systemd services files
- Switch to systemd-tmpfiles.d
- Review deps
- Fix python2 shebang; not use of /usr/bin/env anymore
- A check() function
- Copy all udev rules
- Fix bash-completion directories
- Drop contributor history; too long and more than 90% of the pkg rewritten.
Added:
ceph/trunk/01-boost-158.patch
Modified:
ceph/trunk/PKGBUILD
ceph/trunk/ceph-mds at .service
ceph/trunk/ceph-mon at .service
ceph/trunk/ceph-osd at .service
ceph/trunk/ceph.install
--------------------+
01-boost-158.patch | 27 +++++++++++
PKGBUILD | 118 ++++++++++++++++++++++++---------------------------
ceph-mds at .service | 7 ---
ceph-mon at .service | 7 ---
ceph-osd at .service | 7 ---
ceph.install | 11 ++--
6 files changed, 92 insertions(+), 85 deletions(-)
Added: 01-boost-158.patch
===================================================================
--- 01-boost-158.patch (rev 0)
+++ 01-boost-158.patch 2015-05-31 15:35:47 UTC (rev 239964)
@@ -0,0 +1,27 @@
+From e7b196a4a091c0ea258866559ba06e7ed0cc4247 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <kchai at redhat.com>
+Date: Fri, 8 May 2015 15:21:20 +0800
+Subject: [PATCH] mon: remove unused variable
+
+* as a side effect, this change silences
+ http://tracker.ceph.com/issues/11576
+
+Fixes: #11576
+Signed-off-by: Kefu Chai <kchai at redhat.com>
+---
+ src/mon/OSDMonitor.cc | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
+index 73dcd5f..7caaa45 100644
+--- a/src/mon/OSDMonitor.cc
++++ b/src/mon/OSDMonitor.cc
+@@ -3174,8 +3174,6 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
+ } else if (prefix == "osd crush get-tunable") {
+ string tunable;
+ cmd_getval(g_ceph_context, cmdmap, "tunable", tunable);
+- int value;
+- cmd_getval(g_ceph_context, cmdmap, "value", value);
+ ostringstream rss;
+ if (f)
+ f->open_object_section("tunable");
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-05-31 13:51:26 UTC (rev 239963)
+++ PKGBUILD 2015-05-31 15:35:47 UTC (rev 239964)
@@ -1,50 +1,61 @@
# $Id$
# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
-# Contributor: Ido Rosen <ido at kernel.org>
-# Contributor: Evan Teitelman <teitelmanevan at gmail.com>
-# Contributor: Eric Renfro <erenfro at gmail.com>
-# Contributor: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Marti Raudsepp <marti at juffo.org>
-# Contributor: Sandman <the0sandman at hotmail.com>
-# Contributor: raw <spam at rw23.de>
-# Contributor: Dave Simons <miouhpi at gmail.com>
-# Contributor: David Anderson <dave at natulte.net>
-# Contributor: Joe Julian <me at joejulian.name>
-# Contributor: Emil Renner Berthing <esmil at mailme.dk>
pkgname=ceph
-pkgver=9.0.0
-pkgrel=1
+pkgver=0.94.1
+pkgrel=0.2
pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
arch=('x86_64' 'i686')
url='http://ceph.com/'
license=('GPL')
-depends=('libedit' 'libsigc++' 'gtkmm' 'btrfs-progs' 'crypto++'
- 'gperftools' 'python2' 'fuse' 'keyutils'
- 'libatomic_ops' 'curl' 'libaio' 'fcgi' 'expat' 'boost'
- 'leveldb' 'xfsprogs')
-makedepends=('boost' 'boost-libs' 'yasm')
+makedepends=('boost' 'systemd' 'xfsprogs')
+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
-options=('!libtool' 'emptydirs')
source=("http://ceph.com/download/$pkgname-$pkgver.tar.bz2"
'ceph-osd at .service'
'ceph-mon at .service'
'ceph-mds at .service'
- 'ceph.install')
+ '01-boost-158.patch')
+md5sums=('e4a625aa2c91fe5d3f0c62faa4716ca2'
+ '9104b5b90349d2aa7802eb89158456e8'
+ '63a584aa2a4e2b0efbee4e8fd32593f0'
+ 'd2411c41208d95743baa6d899cc1e0b0'
+ '99ddd5aee25664de55055ed1bd78941d')
prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- # fix python scripts to use python2
- find . -type f -exec sed -i 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,g' {} \;
- # Some python scripts are autogenerated through Makefiles. Fix those
- # too, or /usr/bin/ceph will have the wrong shebang.
- find . -type f -exec sed -i 's,"#!/usr/bin/env python","#!/usr/bin/env python2",g' {} \;
+ patch -p1 -d $pkgname-$pkgver < 01-boost-158.patch
+ # fix python2 shebang
+ find $pkgname-$pkgver -type f -exec \
+ sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
+ # substitue buggy shebang in src/Makefile.in
+ sed -i 's,"#!/usr/bin/env python","#!/usr/bin/python2",' \
+ $pkgname-$pkgver/src/Makefile.in
}
build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- LIBS="-lpthread -lboost_system" PYTHON=/usr/bin/python2 LDFLAGS="" ./configure \
+ cd $pkgname-$pkgver
+ export PYTHON=/usr/bin/python2
+ ./configure \
--prefix=/usr \
--sbindir=/usr/bin \
--libexecdir=/usr/lib \
@@ -51,43 +62,28 @@
--sysconfdir=/etc \
--localstatedir=/var \
--with-radosgw
-
make
}
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
+ cd "$pkgdir"
- install -dm755 "$pkgdir/var/run/ceph" "$pkgdir/var/log/ceph" \
- "$pkgdir/etc/rc.d" "$pkgdir/etc/ceph"
+ # systemd
+ install -dm755 usr/lib/{systemd/system,udev/rules.d}
+ install -Dm644 "$srcdir"/ceph-{osd,mon,mds}@.service usr/lib/systemd/system
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/udev/* usr/lib/udev/rules.d
- # Systemd.
- install -dm755 "$pkgdir/usr/lib/systemd/system"
- install -Dm644 "$srcdir/ceph-osd at .service" "$pkgdir/usr/lib/systemd/system/ceph-osd at .service"
- install -Dm644 "$srcdir/ceph-mon at .service" "$pkgdir/usr/lib/systemd/system/ceph-mon at .service"
- install -Dm644 "$srcdir/ceph-mds at .service" "$pkgdir/usr/lib/systemd/system/ceph-mds at .service"
- install -Dm755 "src/init-ceph" "$pkgdir/etc/rc.d/ceph"
+ # fix directories path
+ mv sbin/* usr/bin
+ mv etc/bash_completion.d usr/share/bash-completion
+ rmdir sbin
+}
- # Ceph udev rules.
- install -Dm644 "udev/50-rbd.rules" "$pkgdir/usr/lib/udev/rules.d/50-rbd.rules"
- install -Dm644 "udev/60-ceph-partuuid-workaround.rules" \
- "$pkgdir/usr/lib/udev/rules.d/60-ceph-partuuid-workaround.rules"
- install -Dm644 "udev/95-ceph-osd-alt.rules" "$pkgdir/usr/lib/udev/rules.d/95-ceph-osd.rules"
-
- # Fix bin directory.
- mv "$pkgdir/sbin/"* "$pkgdir/usr/bin"
- rmdir "$pkgdir/sbin"
-
- # Sample config.
- install -Dm644 "$pkgdir/usr/share/doc/ceph/sample.ceph.conf" \
- "$pkgdir/etc/ceph/ceph.conf.sample"
-
- # License.
- install -Dm644 COPYING \
- "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
- # Clean up.
- rm -rf "$pkgdir/var/run"
-}
+# vim:set ts=2 sw=2 et:
Modified: ceph-mds at .service
===================================================================
--- ceph-mds at .service 2015-05-31 13:51:26 UTC (rev 239963)
+++ ceph-mds at .service 2015-05-31 15:35:47 UTC (rev 239964)
@@ -1,14 +1,9 @@
[Unit]
-Description=CephFS MDS %i
-Requires=network.target
+Description=Ceph MDS %i
After=network.target
[Service]
-Type=simple
-Restart=always
-RestartSec=2s
ExecStart=/usr/bin/ceph-mds -f -i %i
[Install]
WantedBy=multi-user.target
-
Modified: ceph-mon at .service
===================================================================
--- ceph-mon at .service 2015-05-31 13:51:26 UTC (rev 239963)
+++ ceph-mon at .service 2015-05-31 15:35:47 UTC (rev 239964)
@@ -1,14 +1,9 @@
[Unit]
-Description=CephFS MON %i
-Requires=network.target
+Description=Ceph MON %i
After=network.target
[Service]
-Type=simple
-Restart=always
-RestartSec=2s
ExecStart=/usr/bin/ceph-mon -f -i %i
[Install]
WantedBy=multi-user.target
-
Modified: ceph-osd at .service
===================================================================
--- ceph-osd at .service 2015-05-31 13:51:26 UTC (rev 239963)
+++ ceph-osd at .service 2015-05-31 15:35:47 UTC (rev 239964)
@@ -1,14 +1,9 @@
[Unit]
-Description=CephFS OSD %i
-Requires=network.target
+Description=Ceph OSD %i
After=network.target
[Service]
-Type=simple
-Restart=always
-RestartSec=2s
ExecStart=/usr/bin/ceph-osd -f -i %i
[Install]
WantedBy=multi-user.target
-
Modified: ceph.install
===================================================================
--- ceph.install 2015-05-31 13:51:26 UTC (rev 239963)
+++ ceph.install 2015-05-31 15:35:47 UTC (rev 239964)
@@ -1,9 +1,8 @@
+# vim:set ts=2 sw=2 ft=sh et:
+
+# arg 1: the new package version
post_install() {
- mkdir /var/run/ceph
+ #systemd-tmpfiles --create ceph.conf
+ :
}
-pre_remove() {
- rmdir --ignore-fail-on-non-empty /var/run/ceph
-}
-
-# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list