From 4c45f73266d7580ac502630e6bdb0b3898fa8962 Mon Sep 17 00:00:00 2001
From: James Thomas <james.thomas@codethink.co.uk>
Date: Fri, 22 May 2015 11:22:48 +0000
Subject: Split gdp libs into separate stratum

---
 strata/genivi-demo-platform-libs.morph            | 23 +++++++++++
 strata/genivi-demo-platform.morph                 | 50 +----------------------
 systems/genivi-demo-platform-x86_64-generic.morph |  2 +
 3 files changed, 26 insertions(+), 49 deletions(-)
 create mode 100644 strata/genivi-demo-platform-libs.morph

diff --git a/strata/genivi-demo-platform-libs.morph b/strata/genivi-demo-platform-libs.morph
new file mode 100644
index 00000000..07af27f4
--- /dev/null
+++ b/strata/genivi-demo-platform-libs.morph
@@ -0,0 +1,23 @@
+name: genivi-demo-platform-libs
+kind: stratum
+description: Libraries needed for the GENIVI demo platform.
+build-depends:
+- morph: strata/foundation.morph
+- morph: strata/python-pygobject.morph
+chunks:
+- name: boost
+  morph: strata/genivi-demo-platform/boost.morph
+  repo: upstream:boost-tarball
+  ref: ed232fdd34968697a68783b3195b1da4226915b5
+  unpetrify-ref: boost_1_57_0
+  build-depends: []
+- name: dbus-c++
+  morph: strata/genivi-demo-platform/dbus-c++.morph
+  repo: upstream:dbus-c++
+  ref: 8d351eec25430651acbac014e44ec011fac32d57
+  unpetrify-ref: baserock/genivi-demo-platform
+  build-depends: []
+- name: dbus-python
+  repo: upstream:dbus-python
+  ref: d0d5b5be685dc4c16b21c54335becc87ca4d6f58
+  unpetrify-ref: dbus-python-1.2.0
diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph
index e9add8be..79c009cb 100644
--- a/strata/genivi-demo-platform.morph
+++ b/strata/genivi-demo-platform.morph
@@ -2,71 +2,25 @@ name: genivi-demo-platform
 kind: stratum
 description: Components which make up the GENIVI demo platform.
 build-depends:
-- morph: strata/gtk2.morph
+- morph: strata/genivi-demo-platform-libs.morph
 - morph: strata/qt5-tools.morph
 - morph: strata/qt5-tools-qtmultimedia.morph
 - morph: strata/qt5-tools-qtwebkit.morph
 - morph: strata/genivi.morph
 - morph: strata/wayland-generic.morph
 - morph: strata/weston-genivi-gdp.morph
-- morph: strata/python-pygobject.morph
 chunks:
-- name: mm-common
-  morph: strata/genivi-demo-platform/mm-common.morph
-  repo: upstream:mm-common
-  ref: baserock/genivi-demo-platform
-  unpetrify-ref: master
-  build-depends: []
-- name: sigc++
-  morph: strata/genivi-demo-platform/sigc++.morph
-  repo: upstream:sigc++
-  ref: d3f8647ee43f875915ddedbaaf719cc2a3d98c52
-  unpetrify-ref: master
-  build-depends:
-  - mm-common
-- name: glibmm
-  morph: strata/genivi-demo-platform/glibmm.morph
-  repo: upstream:glibmm
-  ref: e289d513b1565d7f829d62d54bff6b629d760379
-  unpetrify-ref: glibmm-2-40
-  build-depends:
-  - mm-common
-  - sigc++
-- name: boost
-  morph: strata/genivi-demo-platform/boost.morph
-  repo: upstream:boost-tarball
-  ref: ed232fdd34968697a68783b3195b1da4226915b5
-  unpetrify-ref: boost_1_57_0
-  build-depends: []
-- name: dbus-c++
-  morph: strata/genivi-demo-platform/dbus-c++.morph
-  repo: upstream:dbus-c++
-  ref: 8d351eec25430651acbac014e44ec011fac32d57
-  unpetrify-ref: baserock/genivi-demo-platform
-  build-depends: []
-- name: libxslt
-  repo: upstream:libxslt
-  ref: master
-  build-depends: []
 - name: browser-poc
   morph: strata/genivi-demo-platform/browser-poc.morph
   repo: upstream:genivi/browser-poc
 #  ref: f1d02d11d86d53b96c85a2ea03d7cd4736c1c616
   ref: baserock/jonathanmaw/genivi-demo-platform
   unpetrify-ref: baserock/jonathanmaw/genivi-demo-platform
-  build-depends: []
-- name: dbus-python
-  repo: upstream:dbus-python
-  ref: d0d5b5be685dc4c16b21c54335becc87ca4d6f58
-  unpetrify-ref: dbus-python-1.2.0
 - name: automotive-message-broker
   morph: strata/genivi-demo-platform/automotive-message-broker.morph
   repo: upstream:automotive-message-broker
   ref: 5cac4bd2958ea24ac6913be5baa0dfcda6466089
   unpetrify-ref: "0.14"
-  build-depends:
-  - dbus-python
-  - boost
 - name: audiomanager-poc
   morph: strata/genivi-demo-platform/audiomanager-poc.morph
   repo: upstream:audiomanager
@@ -81,5 +35,3 @@ chunks:
   repo: upstream:genivi/genivi-demo-platform-hmi
   ref: baserock/genivi/gdp-0.1
   unpetrify-ref: 3955d0dd4a544577f812854ef333ddb80dbc177f
-  build-depends:
-  - dbus-c++
diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph
index 80f1a5a2..a7081a91 100644
--- a/systems/genivi-demo-platform-x86_64-generic.morph
+++ b/systems/genivi-demo-platform-x86_64-generic.morph
@@ -51,6 +51,8 @@ strata:
   morph: strata/gtk2.morph
 - name: python-pygobject
   morph: strata/python-pygobject.morph
+- name: genivi-demo-platform-libs
+  morph: strata/genivi-demo-platform-libs.morph
 - name: genivi-demo-platform
   morph: strata/genivi-demo-platform.morph
 - name: tools
-- 
cgit v1.2.1