summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-04-07 20:52:36 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-04-08 17:21:43 (GMT)
commit942bf3731eb1f49132e5630156ff317ff30c2c7a (patch)
treefd6ee30ca3b4d63e6f0d3f9c0416b6ce83ea48f9
parent4d88d29e3a0ce720d82d16dad3155ea488db027c (diff)
downloaddefinitions-942bf3731eb1f49132e5630156ff317ff30c2c7a.tar.gz
Move boost to new stratum: cpp-common-libs
Change-Id: I56ac7f4a9ac4e2559a31cb66e0233a0c0707e1a6
-rw-r--r--strata/ceph-service.morph7
-rw-r--r--strata/ceph-service/boost.morph8
-rw-r--r--strata/cpp-common-libs.morph11
-rw-r--r--strata/cpp-common-libs/boost.morph (renamed from strata/genivi-demo-platform-libs/boost.morph)1
-rw-r--r--strata/genivi-demo-platform-libs.morph5
-rw-r--r--strata/genivi-demo-platform.morph1
-rw-r--r--systems/ceph-service-x86_64-generic.morph2
-rw-r--r--systems/genivi-demo-platform-armv7lhf-jetson.morph2
-rw-r--r--systems/genivi-demo-platform-x86_64-generic.morph2
9 files changed, 20 insertions, 19 deletions
diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph
index 39e1c91..0cd09dc 100644
--- a/strata/ceph-service.morph
+++ b/strata/ceph-service.morph
@@ -1,6 +1,7 @@
name: ceph-service
kind: stratum
build-depends:
+- morph: strata/cpp-common-libs.morph
- morph: strata/foundation.morph
- morph: strata/network-security.morph
chunks:
@@ -44,11 +45,6 @@ chunks:
ref: 7503ff5f8610734521f40e276b59b3b6291830e7
unpetrify-ref: baserock/morph
build-system: autotools
-- name: boost
- morph: strata/ceph-service/boost.morph
- repo: upstream:boost-tarball
- ref: ed232fdd34968697a68783b3195b1da4226915b5
- unpetrify-ref: boost_1_57_0
- name: ceph
morph: strata/ceph-service/ceph.morph
repo: upstream:ceph
@@ -60,7 +56,6 @@ chunks:
- leveldb
- libeditline
- keyutils
- - boost
submodules:
src/erasure-code/jerasure/gf-complete:
url: https://github.com/ceph/gf-complete.git
diff --git a/strata/ceph-service/boost.morph b/strata/ceph-service/boost.morph
deleted file mode 100644
index fa785e3..0000000
--- a/strata/ceph-service/boost.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: boost
-kind: chunk
-configure-commands:
-- ./bootstrap.sh
-build-commands:
-- ./b2
-install-commands:
-- ./b2 install --prefix="$DESTDIR$PREFIX"
diff --git a/strata/cpp-common-libs.morph b/strata/cpp-common-libs.morph
new file mode 100644
index 0000000..470f015
--- /dev/null
+++ b/strata/cpp-common-libs.morph
@@ -0,0 +1,11 @@
+name: cpp-common-libs
+kind: stratum
+description: C++ common libraries
+build-depends:
+- morph: strata/python2-core.morph
+chunks:
+- name: boost
+ morph: strata/cpp-common-libs/boost.morph
+ repo: upstream:boost-tarball
+ ref: ed232fdd34968697a68783b3195b1da4226915b5
+ unpetrify-ref: boost_1_57_0
diff --git a/strata/genivi-demo-platform-libs/boost.morph b/strata/cpp-common-libs/boost.morph
index 49c0590..6aaee8a 100644
--- a/strata/genivi-demo-platform-libs/boost.morph
+++ b/strata/cpp-common-libs/boost.morph
@@ -1,5 +1,6 @@
name: boost
kind: chunk
+build-system: manual
configure-commands:
- ./bootstrap.sh
build-commands:
diff --git a/strata/genivi-demo-platform-libs.morph b/strata/genivi-demo-platform-libs.morph
index 598180b..5ddc0d1 100644
--- a/strata/genivi-demo-platform-libs.morph
+++ b/strata/genivi-demo-platform-libs.morph
@@ -6,11 +6,6 @@ build-depends:
- morph: strata/python-pygobject.morph
- morph: strata/audio-bluetooth.morph
chunks:
-- name: boost
- morph: strata/genivi-demo-platform-libs/boost.morph
- repo: upstream:boost-tarball
- ref: ed232fdd34968697a68783b3195b1da4226915b5
- unpetrify-ref: boost_1_57_0
- name: dbus-c++
morph: strata/genivi-demo-platform-libs/dbus-c++.morph
repo: upstream:dbus-c++
diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph
index 50a2e04..8107262 100644
--- a/strata/genivi-demo-platform.morph
+++ b/strata/genivi-demo-platform.morph
@@ -2,6 +2,7 @@ name: genivi-demo-platform
kind: stratum
description: Components which make up the GENIVI demo platform.
build-depends:
+- morph: strata/cpp-common-libs.morph
- morph: strata/genivi-demo-platform-libs.morph
- morph: strata/qt5-tools.morph
- morph: strata/qt5-tools-qtmultimedia.morph
diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph
index 803d002..0e26355 100644
--- a/systems/ceph-service-x86_64-generic.morph
+++ b/systems/ceph-service-x86_64-generic.morph
@@ -8,6 +8,8 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: cpp-common-libs
+ morph: strata/cpp-common-libs.morph
- name: foundation
morph: strata/foundation.morph
- name: bsp-x86_64-generic
diff --git a/systems/genivi-demo-platform-armv7lhf-jetson.morph b/systems/genivi-demo-platform-armv7lhf-jetson.morph
index b2eef77..f61b61c 100644
--- a/systems/genivi-demo-platform-armv7lhf-jetson.morph
+++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph
@@ -7,6 +7,8 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: cpp-common-libs
+ morph: strata/cpp-common-libs.morph
- name: python2-core
morph: strata/python2-core.morph
- name: glib-common
diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph
index 17f077a..e5c8c6c 100644
--- a/systems/genivi-demo-platform-x86_64-generic.morph
+++ b/systems/genivi-demo-platform-x86_64-generic.morph
@@ -7,6 +7,8 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: cpp-common-libs
+ morph: strata/cpp-common-libs.morph
- name: python2-core
morph: strata/python2-core.morph
- name: glib-common