[arch-commits] Commit in ceph/repos (20 files)

Sébastien Luttringer seblu at archlinux.org
Sun Jul 5 23:20:01 UTC 2015


    Date: Monday, July 6, 2015 @ 01:20:01
  Author: seblu
Revision: 241837

archrelease: copy trunk to extra-x86_64, extra-i686

Added:
  ceph/repos/extra-i686/01-boost-158.patch
    (from rev 241836, ceph/trunk/01-boost-158.patch)
  ceph/repos/extra-i686/PKGBUILD
    (from rev 241836, ceph/trunk/PKGBUILD)
  ceph/repos/extra-i686/ceph-mds at .service
    (from rev 241836, ceph/trunk/ceph-mds at .service)
  ceph/repos/extra-i686/ceph-mon at .service
    (from rev 241836, ceph/trunk/ceph-mon at .service)
  ceph/repos/extra-i686/ceph-osd at .service
    (from rev 241836, ceph/trunk/ceph-osd at .service)
  ceph/repos/extra-x86_64/01-boost-158.patch
    (from rev 241836, ceph/trunk/01-boost-158.patch)
  ceph/repos/extra-x86_64/PKGBUILD
    (from rev 241836, ceph/trunk/PKGBUILD)
  ceph/repos/extra-x86_64/ceph-mds at .service
    (from rev 241836, ceph/trunk/ceph-mds at .service)
  ceph/repos/extra-x86_64/ceph-mon at .service
    (from rev 241836, ceph/trunk/ceph-mon at .service)
  ceph/repos/extra-x86_64/ceph-osd at .service
    (from rev 241836, ceph/trunk/ceph-osd at .service)
Deleted:
  ceph/repos/extra-i686/01-boost-158.patch
  ceph/repos/extra-i686/PKGBUILD
  ceph/repos/extra-i686/ceph-mds at .service
  ceph/repos/extra-i686/ceph-mon at .service
  ceph/repos/extra-i686/ceph-osd at .service
  ceph/repos/extra-x86_64/01-boost-158.patch
  ceph/repos/extra-x86_64/PKGBUILD
  ceph/repos/extra-x86_64/ceph-mds at .service
  ceph/repos/extra-x86_64/ceph-mon at .service
  ceph/repos/extra-x86_64/ceph-osd at .service

---------------------------------+
 /01-boost-158.patch             |   54 ++++++++++++
 /PKGBUILD                       |  164 ++++++++++++++++++++++++++++++++++++++
 /ceph-mds at .service              |   18 ++++
 /ceph-mon at .service              |   18 ++++
 /ceph-osd at .service              |   18 ++++
 extra-i686/01-boost-158.patch   |   27 ------
 extra-i686/PKGBUILD             |   83 -------------------
 extra-i686/ceph-mds at .service    |    9 --
 extra-i686/ceph-mon at .service    |    9 --
 extra-i686/ceph-osd at .service    |    9 --
 extra-x86_64/01-boost-158.patch |   27 ------
 extra-x86_64/PKGBUILD           |   83 -------------------
 extra-x86_64/ceph-mds at .service  |    9 --
 extra-x86_64/ceph-mon at .service  |    9 --
 extra-x86_64/ceph-osd at .service  |    9 --
 15 files changed, 272 insertions(+), 274 deletions(-)

Deleted: extra-i686/01-boost-158.patch
===================================================================
--- extra-i686/01-boost-158.patch	2015-07-05 23:19:17 UTC (rev 241836)
+++ extra-i686/01-boost-158.patch	2015-07-05 23:20:01 UTC (rev 241837)
@@ -1,27 +0,0 @@
-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/extra-i686/01-boost-158.patch (from rev 241836, ceph/trunk/01-boost-158.patch)
===================================================================
--- extra-i686/01-boost-158.patch	                        (rev 0)
+++ extra-i686/01-boost-158.patch	2015-07-05 23:20:01 UTC (rev 241837)
@@ -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");

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-07-05 23:19:17 UTC (rev 241836)
+++ extra-i686/PKGBUILD	2015-07-05 23:20:01 UTC (rev 241837)
@@ -1,83 +0,0 @@
-# $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/extra-i686/PKGBUILD (from rev 241836, ceph/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-07-05 23:20:01 UTC (rev 241837)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+
+pkgname=ceph
+pkgver=0.94.2
+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=('249648d35e634adaaeec727408ca6092'
+         '9104b5b90349d2aa7802eb89158456e8'
+         '63a584aa2a4e2b0efbee4e8fd32593f0'
+         'd2411c41208d95743baa6d899cc1e0b0'
+         '99ddd5aee25664de55055ed1bd78941d')
+
+prepare() {
+  patch -p1 -d $pkgname-$pkgver < 01-boost-158.patch
+}
+
+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
+
+  # fix python2 shebang, did not do it in prepare() anymore because it
+  # confuse automake
+  find . -type f -exec \
+    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-i686/ceph-mds at .service
===================================================================
--- extra-i686/ceph-mds at .service	2015-07-05 23:19:17 UTC (rev 241836)
+++ extra-i686/ceph-mds at .service	2015-07-05 23:20:01 UTC (rev 241837)
@@ -1,9 +0,0 @@
-[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/extra-i686/ceph-mds at .service (from rev 241836, ceph/trunk/ceph-mds at .service)
===================================================================
--- extra-i686/ceph-mds at .service	                        (rev 0)
+++ extra-i686/ceph-mds at .service	2015-07-05 23:20:01 UTC (rev 241837)
@@ -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

Deleted: extra-i686/ceph-mon at .service
===================================================================
--- extra-i686/ceph-mon at .service	2015-07-05 23:19:17 UTC (rev 241836)
+++ extra-i686/ceph-mon at .service	2015-07-05 23:20:01 UTC (rev 241837)
@@ -1,9 +0,0 @@
-[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/extra-i686/ceph-mon at .service (from rev 241836, ceph/trunk/ceph-mon at .service)
===================================================================
--- extra-i686/ceph-mon at .service	                        (rev 0)
+++ extra-i686/ceph-mon at .service	2015-07-05 23:20:01 UTC (rev 241837)
@@ -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

Deleted: extra-i686/ceph-osd at .service
===================================================================
--- extra-i686/ceph-osd at .service	2015-07-05 23:19:17 UTC (rev 241836)
+++ extra-i686/ceph-osd at .service	2015-07-05 23:20:01 UTC (rev 241837)
@@ -1,9 +0,0 @@
-[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/extra-i686/ceph-osd at .service (from rev 241836, ceph/trunk/ceph-osd at .service)
===================================================================
--- extra-i686/ceph-osd at .service	                        (rev 0)
+++ extra-i686/ceph-osd at .service	2015-07-05 23:20:01 UTC (rev 241837)
@@ -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

Deleted: extra-x86_64/01-boost-158.patch
===================================================================
--- extra-x86_64/01-boost-158.patch	2015-07-05 23:19:17 UTC (rev 241836)
+++ extra-x86_64/01-boost-158.patch	2015-07-05 23:20:01 UTC (rev 241837)
@@ -1,27 +0,0 @@
-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/extra-x86_64/01-boost-158.patch (from rev 241836, ceph/trunk/01-boost-158.patch)
===================================================================
--- extra-x86_64/01-boost-158.patch	                        (rev 0)
+++ extra-x86_64/01-boost-158.patch	2015-07-05 23:20:01 UTC (rev 241837)
@@ -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");

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-07-05 23:19:17 UTC (rev 241836)
+++ extra-x86_64/PKGBUILD	2015-07-05 23:20:01 UTC (rev 241837)
@@ -1,83 +0,0 @@
-# $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/extra-x86_64/PKGBUILD (from rev 241836, ceph/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-07-05 23:20:01 UTC (rev 241837)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+
+pkgname=ceph
+pkgver=0.94.2
+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=('249648d35e634adaaeec727408ca6092'
+         '9104b5b90349d2aa7802eb89158456e8'
+         '63a584aa2a4e2b0efbee4e8fd32593f0'
+         'd2411c41208d95743baa6d899cc1e0b0'
+         '99ddd5aee25664de55055ed1bd78941d')
+
+prepare() {
+  patch -p1 -d $pkgname-$pkgver < 01-boost-158.patch
+}
+
+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
+
+  # fix python2 shebang, did not do it in prepare() anymore because it
+  # confuse automake
+  find . -type f -exec \
+    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-x86_64/ceph-mds at .service
===================================================================
--- extra-x86_64/ceph-mds at .service	2015-07-05 23:19:17 UTC (rev 241836)
+++ extra-x86_64/ceph-mds at .service	2015-07-05 23:20:01 UTC (rev 241837)
@@ -1,9 +0,0 @@
-[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/extra-x86_64/ceph-mds at .service (from rev 241836, ceph/trunk/ceph-mds at .service)
===================================================================
--- extra-x86_64/ceph-mds at .service	                        (rev 0)
+++ extra-x86_64/ceph-mds at .service	2015-07-05 23:20:01 UTC (rev 241837)
@@ -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

Deleted: extra-x86_64/ceph-mon at .service
===================================================================
--- extra-x86_64/ceph-mon at .service	2015-07-05 23:19:17 UTC (rev 241836)
+++ extra-x86_64/ceph-mon at .service	2015-07-05 23:20:01 UTC (rev 241837)
@@ -1,9 +0,0 @@
-[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/extra-x86_64/ceph-mon at .service (from rev 241836, ceph/trunk/ceph-mon at .service)
===================================================================
--- extra-x86_64/ceph-mon at .service	                        (rev 0)
+++ extra-x86_64/ceph-mon at .service	2015-07-05 23:20:01 UTC (rev 241837)
@@ -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

Deleted: extra-x86_64/ceph-osd at .service
===================================================================
--- extra-x86_64/ceph-osd at .service	2015-07-05 23:19:17 UTC (rev 241836)
+++ extra-x86_64/ceph-osd at .service	2015-07-05 23:20:01 UTC (rev 241837)
@@ -1,9 +0,0 @@
-[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/extra-x86_64/ceph-osd at .service (from rev 241836, ceph/trunk/ceph-osd at .service)
===================================================================
--- extra-x86_64/ceph-osd at .service	                        (rev 0)
+++ extra-x86_64/ceph-osd at .service	2015-07-05 23:20:01 UTC (rev 241837)
@@ -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