From 95448ec329af8aa0fe21a6aabaa1c35c8ca8f9fe Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Thu, 18 Dec 2014 10:17:05 +0000 Subject: Remove hack supressing build errors from boost-tarball --- strata/ceph-service/boost.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" -- cgit v1.2.1 From 6ffebfd4374ea314178142d78ba538d05bd7ff9a Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Thu, 18 Dec 2014 10:26:27 +0000 Subject: Switch to more recent release of the boost libraries --- strata/ceph-service.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index 25d6712d..784a46e0 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -48,8 +48,8 @@ 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 -- cgit v1.2.1 From b342a7fed16c892b44296333de800ea96733b93d Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Thu, 18 Dec 2014 11:08:00 +0000 Subject: Switch to most recetn version of libaio --- strata/ceph-service.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index 784a46e0..7e29bdfe 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -7,8 +7,8 @@ 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 -- cgit v1.2.1 From 9acb706e93abfc4a614ee392b0ce26132c5c0cc5 Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Thu, 18 Dec 2014 11:13:50 +0000 Subject: Switch to most recent release of keyutils --- strata/ceph-service.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index 7e29bdfe..a830eb61 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -13,8 +13,8 @@ chunks: - 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 -- cgit v1.2.1 From 1b66074a031a60930b88efb0d418a111c784803d Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Thu, 18 Dec 2014 11:16:22 +0000 Subject: Switch to latest release of libunwind --- strata/ceph-service.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index a830eb61..a5c6953b 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -18,8 +18,8 @@ chunks: 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 -- cgit v1.2.1 From 0fcc55b652d28b27158da5670b12a469e2b52164 Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Thu, 18 Dec 2014 11:23:04 +0000 Subject: Switch to newer release of gperftools --- strata/ceph-service.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index a5c6953b..71ac6d54 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -23,8 +23,8 @@ chunks: 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 -- cgit v1.2.1 From 863c76149a3b1587fbfcc0bab6baccea0028f08d Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Thu, 18 Dec 2014 11:27:14 +0000 Subject: Switch to more recent release of leveldb --- strata/ceph-service.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index 71ac6d54..d81f053b 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -35,8 +35,8 @@ chunks: - 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 -- cgit v1.2.1 From 5bc5d5e8a4ad5c81717912dc58e030f6635f8ef4 Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Thu, 18 Dec 2014 11:35:58 +0000 Subject: Update install commands for leveldb --- strata/ceph-service/leveldb.morph | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1 From dda906e439fae302178e3fc2a8a3bc719f8229c2 Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Thu, 18 Dec 2014 11:39:58 +0000 Subject: Switch to most recent release of snappy --- strata/ceph-service.morph | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index d81f053b..60422e6a 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -28,9 +28,9 @@ chunks: 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 -- cgit v1.2.1 From a4661bab97335f674a01033679a9e4981e6826e6 Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Thu, 18 Dec 2014 11:44:40 +0000 Subject: Switch to a patched version of the most recent release of ceph --- strata/ceph-service.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index 60422e6a..1108ab4b 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -54,8 +54,8 @@ chunks: - 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 -- cgit v1.2.1 From 0182b690e74fbb13017ebeb2d6e7e828c0cfcebb Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Wed, 26 Nov 2014 10:18:11 +0000 Subject: Ensure ceph configures to be run without libxfs --- strata/ceph-service/ceph.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/ceph-service/ceph.morph b/strata/ceph-service/ceph.morph index 5ad0d812..67caff77 100644 --- a/strata/ceph-service/ceph.morph +++ b/strata/ceph-service/ceph.morph @@ -3,7 +3,7 @@ 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 install-commands: - make install - install -D -m 755 src/init-ceph $DESTDIR/etc/init.d/ceph -- cgit v1.2.1 From 3ef6555d3ce3273e440f9d8664211dbfca075324 Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Thu, 18 Dec 2014 12:01:19 +0000 Subject: Install the systemd units for operating ceph nodes and change name of the SysV script to accomodate this --- strata/ceph-service/ceph.morph | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/strata/ceph-service/ceph.morph b/strata/ceph-service/ceph.morph index 67caff77..9bb038d1 100644 --- a/strata/ceph-service/ceph.morph +++ b/strata/ceph-service/ceph.morph @@ -4,15 +4,22 @@ build-system: autotools configure-commands: - NOCONFIGURE=1 ./autogen.sh - ./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 -- cgit v1.2.1 From 6f73f5d827a441676c8e6500a23e2d13e2e6eb72 Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Thu, 18 Dec 2014 12:06:14 +0000 Subject: Switch to cpython v2.7.9 --- strata/core.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index 37133fee..28eb1732 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -123,8 +123,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 -- cgit v1.2.1