[arch-commits] Commit in ceph/repos (12 files)
Sébastien Luttringer
seblu at archlinux.org
Sun May 31 18:28:54 UTC 2015
Date: Sunday, May 31, 2015 @ 20:28:54
Author: seblu
Revision: 239966
archrelease: copy trunk to testing-x86_64, testing-i686
Added:
ceph/repos/testing-i686/
ceph/repos/testing-i686/01-boost-158.patch
(from rev 239965, ceph/trunk/01-boost-158.patch)
ceph/repos/testing-i686/PKGBUILD
(from rev 239965, ceph/trunk/PKGBUILD)
ceph/repos/testing-i686/ceph-mds at .service
(from rev 239965, ceph/trunk/ceph-mds at .service)
ceph/repos/testing-i686/ceph-mon at .service
(from rev 239965, ceph/trunk/ceph-mon at .service)
ceph/repos/testing-i686/ceph-osd at .service
(from rev 239965, ceph/trunk/ceph-osd at .service)
ceph/repos/testing-x86_64/
ceph/repos/testing-x86_64/01-boost-158.patch
(from rev 239965, ceph/trunk/01-boost-158.patch)
ceph/repos/testing-x86_64/PKGBUILD
(from rev 239965, ceph/trunk/PKGBUILD)
ceph/repos/testing-x86_64/ceph-mds at .service
(from rev 239965, ceph/trunk/ceph-mds at .service)
ceph/repos/testing-x86_64/ceph-mon at .service
(from rev 239965, ceph/trunk/ceph-mon at .service)
ceph/repos/testing-x86_64/ceph-osd at .service
(from rev 239965, ceph/trunk/ceph-osd at .service)
-----------------------------------+
testing-i686/01-boost-158.patch | 27 +++++++++++
testing-i686/PKGBUILD | 83 ++++++++++++++++++++++++++++++++++++
testing-i686/ceph-mds at .service | 9 +++
testing-i686/ceph-mon at .service | 9 +++
testing-i686/ceph-osd at .service | 9 +++
testing-x86_64/01-boost-158.patch | 27 +++++++++++
testing-x86_64/PKGBUILD | 83 ++++++++++++++++++++++++++++++++++++
testing-x86_64/ceph-mds at .service | 9 +++
testing-x86_64/ceph-mon at .service | 9 +++
testing-x86_64/ceph-osd at .service | 9 +++
10 files changed, 274 insertions(+)
Copied: ceph/repos/testing-i686/01-boost-158.patch (from rev 239965, ceph/trunk/01-boost-158.patch)
===================================================================
--- testing-i686/01-boost-158.patch (rev 0)
+++ testing-i686/01-boost-158.patch 2015-05-31 18:28:54 UTC (rev 239966)
@@ -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");
Copied: ceph/repos/testing-i686/PKGBUILD (from rev 239965, ceph/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-05-31 18:28:54 UTC (rev 239966)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+
+pkgname=ceph
+pkgver=0.94.1
+pkgrel=1
+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')
+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')
+source=("http://ceph.com/download/$pkgname-$pkgver.tar.bz2"
+ 'ceph-osd at .service'
+ 'ceph-mon at .service'
+ 'ceph-mds at .service'
+ '01-boost-158.patch')
+md5sums=('e4a625aa2c91fe5d3f0c62faa4716ca2'
+ '9104b5b90349d2aa7802eb89158456e8'
+ '63a584aa2a4e2b0efbee4e8fd32593f0'
+ 'd2411c41208d95743baa6d899cc1e0b0'
+ '99ddd5aee25664de55055ed1bd78941d')
+
+prepare() {
+ 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 $pkgname-$pkgver
+ export PYTHON=/usr/bin/python2
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-radosgw
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ cd "$pkgdir"
+
+ # 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
+
+ # fix directories path
+ mv sbin/* usr/bin
+ mv etc/bash_completion.d usr/share/bash-completion
+ rmdir sbin
+}
+
+# vim:set ts=2 sw=2 et:
Copied: ceph/repos/testing-i686/ceph-mds at .service (from rev 239965, ceph/trunk/ceph-mds at .service)
===================================================================
--- testing-i686/ceph-mds at .service (rev 0)
+++ testing-i686/ceph-mds at .service 2015-05-31 18:28:54 UTC (rev 239966)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Ceph MDS %i
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/ceph-mds -f -i %i
+
+[Install]
+WantedBy=multi-user.target
Copied: ceph/repos/testing-i686/ceph-mon at .service (from rev 239965, ceph/trunk/ceph-mon at .service)
===================================================================
--- testing-i686/ceph-mon at .service (rev 0)
+++ testing-i686/ceph-mon at .service 2015-05-31 18:28:54 UTC (rev 239966)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Ceph MON %i
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/ceph-mon -f -i %i
+
+[Install]
+WantedBy=multi-user.target
Copied: ceph/repos/testing-i686/ceph-osd at .service (from rev 239965, ceph/trunk/ceph-osd at .service)
===================================================================
--- testing-i686/ceph-osd at .service (rev 0)
+++ testing-i686/ceph-osd at .service 2015-05-31 18:28:54 UTC (rev 239966)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Ceph OSD %i
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/ceph-osd -f -i %i
+
+[Install]
+WantedBy=multi-user.target
Copied: ceph/repos/testing-x86_64/01-boost-158.patch (from rev 239965, ceph/trunk/01-boost-158.patch)
===================================================================
--- testing-x86_64/01-boost-158.patch (rev 0)
+++ testing-x86_64/01-boost-158.patch 2015-05-31 18:28:54 UTC (rev 239966)
@@ -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");
Copied: ceph/repos/testing-x86_64/PKGBUILD (from rev 239965, ceph/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-05-31 18:28:54 UTC (rev 239966)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+
+pkgname=ceph
+pkgver=0.94.1
+pkgrel=1
+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')
+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')
+source=("http://ceph.com/download/$pkgname-$pkgver.tar.bz2"
+ 'ceph-osd at .service'
+ 'ceph-mon at .service'
+ 'ceph-mds at .service'
+ '01-boost-158.patch')
+md5sums=('e4a625aa2c91fe5d3f0c62faa4716ca2'
+ '9104b5b90349d2aa7802eb89158456e8'
+ '63a584aa2a4e2b0efbee4e8fd32593f0'
+ 'd2411c41208d95743baa6d899cc1e0b0'
+ '99ddd5aee25664de55055ed1bd78941d')
+
+prepare() {
+ 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 $pkgname-$pkgver
+ export PYTHON=/usr/bin/python2
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-radosgw
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ cd "$pkgdir"
+
+ # 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
+
+ # fix directories path
+ mv sbin/* usr/bin
+ mv etc/bash_completion.d usr/share/bash-completion
+ rmdir sbin
+}
+
+# vim:set ts=2 sw=2 et:
Copied: ceph/repos/testing-x86_64/ceph-mds at .service (from rev 239965, ceph/trunk/ceph-mds at .service)
===================================================================
--- testing-x86_64/ceph-mds at .service (rev 0)
+++ testing-x86_64/ceph-mds at .service 2015-05-31 18:28:54 UTC (rev 239966)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Ceph MDS %i
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/ceph-mds -f -i %i
+
+[Install]
+WantedBy=multi-user.target
Copied: ceph/repos/testing-x86_64/ceph-mon at .service (from rev 239965, ceph/trunk/ceph-mon at .service)
===================================================================
--- testing-x86_64/ceph-mon at .service (rev 0)
+++ testing-x86_64/ceph-mon at .service 2015-05-31 18:28:54 UTC (rev 239966)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Ceph MON %i
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/ceph-mon -f -i %i
+
+[Install]
+WantedBy=multi-user.target
Copied: ceph/repos/testing-x86_64/ceph-osd at .service (from rev 239965, ceph/trunk/ceph-osd at .service)
===================================================================
--- testing-x86_64/ceph-osd at .service (rev 0)
+++ testing-x86_64/ceph-osd at .service 2015-05-31 18:28:54 UTC (rev 239966)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Ceph OSD %i
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/ceph-osd -f -i %i
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list