summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-19 15:51:21 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-12-19 15:52:46 +0000
commit1448dcb119232e336719938b1ef270a7a09da3a6 (patch)
tree9e22f794418a55503f3e63a1670961e2837ccab9
parentbdd496e908ccd4f178c7f723f8a044ef45e91223 (diff)
parent6f73f5d827a441676c8e6500a23e2d13e2e6eb72 (diff)
downloaddefinitions-1448dcb119232e336719938b1ef270a7a09da3a6.tar.gz
Merge remote-tracking branch 'pdar/updateCephServiceSWrb3'
Reviewed-By: Jim MacArthur <jim.macarthur@codethink.co.uk> Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-rw-r--r--strata/ceph-service.morph34
-rw-r--r--strata/ceph-service/boost.morph4
-rw-r--r--strata/ceph-service/ceph.morph29
-rw-r--r--strata/ceph-service/leveldb.morph5
-rw-r--r--strata/core.morph4
5 files changed, 43 insertions, 33 deletions
diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph
index 25d6712d..1108ab4b 100644
--- a/strata/ceph-service.morph
+++ b/strata/ceph-service.morph
@@ -7,36 +7,36 @@ chunks:
- name: libaio
morph: strata/ceph-service/libaio.morph
repo: upstream:libaio
- ref: 262e589ea4ac3d1ff809648c8f2caa3836e69b25
- unpetrify-ref: baserock/morph
+ ref: 08f50baec0e7731116d3f665c6155d7829edf5d7
+ unpetrify-ref: libaio-0.3.110-1
build-depends: []
- name: keyutils
morph: strata/ceph-service/keyutils.morph
repo: upstream:keyutils
- ref: 116417bce1e1df06a918de5e9e63f6ba88e2f4f5
- unpetrify-ref: baserock/morph
+ ref: 9209a0c8fd63afc59f644e078b40cec531409c30
+ unpetrify-ref: v1.5.9
build-depends: []
- name: libunwind
repo: upstream:libunwind
- ref: 4b8404d153c58b95cb4420fc7603fdae62489a31
- unpetrify-ref: v0.99
+ ref: d7322f0f64dab715c4feb5f08edef5660d8719c0
+ unpetrify-ref: v1.1
build-depends: []
- name: gperftools
repo: upstream:gperftools
- ref: 2a2d6596f8c3d62b7ec444761f4edf0c85d10d92
- unpetrify-ref: baserock/morph
+ ref: 846b775dfadb77901202ae7ddbac30ad1de7df01
+ unpetrify-ref: gperftools-2.2
build-depends:
- libunwind
- name: snappy
- repo: upstream:snappy
- ref: 760c6ffc67836027c5f1d307e5c6cb012dfbdf72
- unpetrify-ref: baserock/morph
+ repo: upstream:snappy-git
+ ref: 1ff9be9b8fafc8528ca9e055646f5932aa5db9c4
+ unpetrify-ref: master
build-depends: []
- name: leveldb
morph: strata/ceph-service/leveldb.morph
repo: upstream:leveldb
- ref: 0f0ed46e70967365c851243663689e156fe1b7b5
- unpetrify-ref: baserock/morph
+ ref: e353fbc7ea81f12a5694991b708f8f45343594b1
+ unpetrify-ref: v1.17
build-depends:
- snappy
- gperftools
@@ -48,14 +48,14 @@ chunks:
- name: boost
morph: strata/ceph-service/boost.morph
repo: upstream:boost-tarball
- ref: 026fc3d84a27e84a61d0f4c26f011a68271a0d6e
- unpetrify-ref: baserock/markdoffman/morph
+ ref: 1c3648bf5b7d17fcd4fe9bc95802b16fd9eee304
+ unpetrify-ref: boost_1_56_0
build-depends: []
- name: ceph
morph: strata/ceph-service/ceph.morph
repo: upstream:ceph
- ref: 8fdf1df512b73bad0eb695cdf9cbf2d09f0327d4
- unpetrify-ref: baserock/morph
+ ref: d3f2ec34d26264ec4deb0b54678ee7bbb2ebc76f
+ unpetrify-ref: master
build-depends:
- libaio
- gperftools
diff --git a/strata/ceph-service/boost.morph b/strata/ceph-service/boost.morph
index 7c3e6cff..cc954076 100644
--- a/strata/ceph-service/boost.morph
+++ b/strata/ceph-service/boost.morph
@@ -3,6 +3,6 @@ kind: chunk
configure-commands:
- ./bootstrap.sh
build-commands:
-- ./b2 || true
+- ./b2
install-commands:
-- ./b2 install --prefix=$DESTDIR$PREFIX || true
+- ./b2 install --prefix="$DESTDIR$PREFIX"
diff --git a/strata/ceph-service/ceph.morph b/strata/ceph-service/ceph.morph
index 5ad0d812..9bb038d1 100644
--- a/strata/ceph-service/ceph.morph
+++ b/strata/ceph-service/ceph.morph
@@ -3,16 +3,23 @@ kind: chunk
build-system: autotools
configure-commands:
- NOCONFIGURE=1 ./autogen.sh
-- ./configure --with-nss --prefix="$PREFIX" --sysconfdir=/etc --without-fuse --without-libatomic-ops
+- ./configure --with-nss --prefix="$PREFIX" --sysconfdir=/etc --without-fuse --without-libatomic-ops --without-libxfs
+build-commands:
+- make
install-commands:
- make install
-- install -D -m 755 src/init-ceph $DESTDIR/etc/init.d/ceph
-- install -d $DESTDIR/etc/ceph
-- install -D -d $DESTDIR/var/lib/ceph
-- install -d $DESTDIR/var/lib/ceph/mon
-- install -d $DESTDIR/var/lib/ceph/osd
-- install -d $DESTDIR/var/lib/ceph/mds
-- install -d $DESTDIR/var/lib/ceph/tmp
-- install -d $DESTDIR/var/lib/ceph/bootstrap-mds
-- install -d $DESTDIR/var/lib/ceph/bootstrap-osd
-- install -D -d $DESTDIR/var/log/ceph
+- install -D -m 755 src/init-ceph.in "$DESTDIR"/etc/init.d/ceph-SysV
+- install -D -m 755 systemd/ceph "$DESTDIR"/etc/systemd/system/ceph
+- install -D -m 755 systemd/ceph-mon@.service "$DESTDIR"/etc/systemd/system/ceph-mon@.service
+- install -D -m 755 systemd/ceph-osd@.service "$DESTDIR"/etc/systemd/system/ceph-osd@.service
+- install -D -m 755 systemd/ceph-mds@.service "$DESTDIR"/etc/systemd/system/ceph-mds@.service
+- install -D -m 755 systemd/ceph.target "$DESTDIR"/etc/systemd/system/ceph.target
+- install -d "$DESTDIR"/etc/ceph
+- install -D -d "$DESTDIR"/var/lib/ceph
+- install -d "$DESTDIR"/var/lib/ceph/mon
+- install -d "$DESTDIR"/var/lib/ceph/osd
+- install -d "$DESTDIR"/var/lib/ceph/mds
+- install -d "$DESTDIR"/var/lib/ceph/tmp
+- install -d "$DESTDIR"/var/lib/ceph/bootstrap-mds
+- install -d "$DESTDIR"/var/lib/ceph/bootstrap-osd
+- install -D -d "$DESTDIR"/var/log/ceph
diff --git a/strata/ceph-service/leveldb.morph b/strata/ceph-service/leveldb.morph
index 1385897c..bff2b87a 100644
--- a/strata/ceph-service/leveldb.morph
+++ b/strata/ceph-service/leveldb.morph
@@ -3,4 +3,7 @@ kind: chunk
build-commands:
- make
install-commands:
-- ./install.sh
+- mkdir -p "$DESTDIR$PREFIX"/lib
+- mkdir -p "$DESTDIR$PREFIX"/include
+- cp --preserve=links libleveldb.* "$DESTDIR$PREFIX"/lib
+- cp -r include/leveldb "$DESTDIR$PREFIX"/include
diff --git a/strata/core.morph b/strata/core.morph
index a1fc9a10..f9db0399 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -117,8 +117,8 @@ chunks:
- name: cpython
morph: strata/core/cpython.morph
repo: upstream:cpython
- ref: 0b92c75574adef1e1ccf1b635a3724a86b567cd2
- unpetrify-ref: v2.7.8
+ ref: d0188e98ecf02e007d85fc34944f8be8f91b7e94
+ unpetrify-ref: v2.7.9
build-depends:
- openssl-new
- bzip2