From 4ef19a1e85252a5d319d0b7158b1bdf3115a674c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 22 Sep 2014 22:28:42 +0100
Subject: Move connman to its own stratum

---
 strata/connectivity.morph                               |  7 -------
 strata/connectivity/connman.morph                       |  6 ------
 strata/connman-common.morph                             | 11 +++++++++++
 strata/connman-common/connman.morph                     |  6 ++++++
 strata/enlightenment.morph                              |  2 +-
 strata/virtualization.morph                             |  2 +-
 systems/devel-system-x86_64-vagrant.morph               |  2 ++
 systems/genivi-baseline-system-armv7lhf-versatile.morph |  2 ++
 systems/genivi-baseline-system-x86_64-generic.morph     |  2 ++
 systems/gitlab-ci-runner.morph                          |  2 ++
 systems/nodejs-system-x86_64.morph                      |  2 ++
 systems/qt4-devel-system-x86_64-generic.morph           |  2 ++
 systems/qt5-devel-system-x86_64-generic.morph           |  2 ++
 systems/xfce-system.morph                               |  2 ++
 14 files changed, 35 insertions(+), 15 deletions(-)
 delete mode 100644 strata/connectivity/connman.morph
 create mode 100644 strata/connman-common.morph
 create mode 100644 strata/connman-common/connman.morph

diff --git a/strata/connectivity.morph b/strata/connectivity.morph
index bf83b8c3..460c5ddc 100644
--- a/strata/connectivity.morph
+++ b/strata/connectivity.morph
@@ -20,10 +20,3 @@ chunks:
   ref: 3e6fa55d5e28c93f417afeae7a7d4f349ddffcf4
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: connman
-  morph: strata/connectivity/connman.morph
-  repo: upstream:connman
-  ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44
-  unpetrify-ref: baserock/1.24
-  build-depends:
-  - iptables
diff --git a/strata/connectivity/connman.morph b/strata/connectivity/connman.morph
deleted file mode 100644
index e468bc49..00000000
--- a/strata/connectivity/connman.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: connman
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./bootstrap
-- ./configure --prefix="$PREFIX" --disable-wispr --disable-client LIBS=-lncurses
diff --git a/strata/connman-common.morph b/strata/connman-common.morph
new file mode 100644
index 00000000..f6f7ddb0
--- /dev/null
+++ b/strata/connman-common.morph
@@ -0,0 +1,11 @@
+name: connman-common
+kind: stratum
+build-depends:
+- morph: strata/connectivity.morph
+chunks:
+- name: connman
+  morph: strata/connman-common/connman.morph
+  repo: upstream:connman
+  ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44
+  unpetrify-ref: baserock/1.24
+  build-depends: []
diff --git a/strata/connman-common/connman.morph b/strata/connman-common/connman.morph
new file mode 100644
index 00000000..e468bc49
--- /dev/null
+++ b/strata/connman-common/connman.morph
@@ -0,0 +1,6 @@
+name: connman
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./bootstrap
+- ./configure --prefix="$PREFIX" --disable-wispr --disable-client LIBS=-lncurses
diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph
index 95b42a6b..7ef6e22a 100644
--- a/strata/enlightenment.morph
+++ b/strata/enlightenment.morph
@@ -7,7 +7,7 @@ build-depends:
 - morph: strata/lua.morph
 - morph: strata/audio-bluetooth.morph
 - morph: strata/multimedia-gstreamer-0.10.morph
-- morph: strata/connectivity.morph
+- morph: strata/connman-common.morph
 chunks:
 - name: efl
   morph: strata/enlightenment/efl.morph
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 1f35df7e..e3261f84 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -2,7 +2,7 @@ name: virtualization
 kind: stratum
 description: virtualization for baserock
 build-depends:
-- morph: strata/connectivity.morph
+- morph: strata/connman-common.morph
 chunks:
 - name: yajl
   morph: strata/virtualization/yajl.morph
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index 454f981d..29acb5bc 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -17,6 +17,8 @@ strata:
   morph: strata/bsp-x86_64-generic.morph
 - name: connectivity
   morph: strata/connectivity.morph
+- name: connman-common
+  morph: strata/connman-common.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: x-common
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index 7c283170..bffcb2e7 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/bsp-armv7-versatile.morph
 - name: connectivity
   morph: strata/connectivity.morph
+- name: connman-common
+  morph: strata/connman-common.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: x-common
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index fe7447ee..d1f479d9 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/bsp-x86_64-generic.morph
 - name: connectivity
   morph: strata/connectivity.morph
+- name: connman-common
+  morph: strata/connman-common.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: x-common
diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph
index 35eef485..0f9e296c 100644
--- a/systems/gitlab-ci-runner.morph
+++ b/systems/gitlab-ci-runner.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/bsp-x86_64-generic.morph
 - name: connectivity
   morph: strata/connectivity.morph
+- name: connman-common
+  morph: strata/connman-common.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: x-common
diff --git a/systems/nodejs-system-x86_64.morph b/systems/nodejs-system-x86_64.morph
index 1dab9f2a..1a810554 100644
--- a/systems/nodejs-system-x86_64.morph
+++ b/systems/nodejs-system-x86_64.morph
@@ -16,6 +16,8 @@ strata:
   morph: strata/bsp-x86_64-generic.morph
 - name: connectivity
   morph: strata/connectivity.morph
+- name: connman-common
+  morph: strata/connman-common.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: x-common
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
index eb3ab48d..0b4e4638 100644
--- a/systems/qt4-devel-system-x86_64-generic.morph
+++ b/systems/qt4-devel-system-x86_64-generic.morph
@@ -30,6 +30,8 @@ strata:
   morph: strata/lua.morph
 - name: connectivity
   morph: strata/connectivity.morph
+- name: connman-common
+  morph: strata/connman-common.morph
 - name: enlightenment
   morph: strata/enlightenment.morph
 configuration-extensions:
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index eafd97e0..7171c0ca 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -30,6 +30,8 @@ strata:
   morph: strata/lua.morph
 - name: connectivity
   morph: strata/connectivity.morph
+- name: connman-common
+  morph: strata/connman-common.morph
 - name: enlightenment
   morph: strata/enlightenment.morph
 configuration-extensions:
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
index efdd7bdb..17531e89 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/bsp-x86_64-generic.morph
 - name: connectivity
   morph: strata/connectivity.morph
+- name: connman-common
+  morph: strata/connman-common.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: x-common
-- 
cgit v1.2.1