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 +-
 6 files changed, 19 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

(limited to 'strata')

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
-- 
cgit v1.2.1


From 584e20d85333604eb51aa80304950c247ec3f639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Tue, 9 Sep 2014 15:01:30 +0000
Subject: Add NetworkManager-common stratum

---
 strata/NetworkManager-common.morph                | 18 ++++++++++++++++++
 strata/NetworkManager-common/NetworkManager.morph |  5 +++++
 2 files changed, 23 insertions(+)
 create mode 100644 strata/NetworkManager-common.morph
 create mode 100644 strata/NetworkManager-common/NetworkManager.morph

(limited to 'strata')

diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
new file mode 100644
index 00000000..7233d84f
--- /dev/null
+++ b/strata/NetworkManager-common.morph
@@ -0,0 +1,18 @@
+name: NetworkManager-common
+kind: stratum
+build-depends:
+- morph: strata/audio-bluetooth.morph
+- morph: strata/network-security.morph
+- morph: strata/connectivity.morph
+chunks:
+- name: libndp
+  repo: upstream:libndp
+  ref: master
+  build-depends: []
+- name: NetworkManager
+  morph: strata/NetworkManager-common/NetworkManager.morph
+  repo: upstream:NetworkManager
+  ref: 6eb82acd6dce882f4b91aafcf68dd9e143ce34e2
+  unpetrify-ref: 0.9.10
+  build-depends:
+  - libndp
diff --git a/strata/NetworkManager-common/NetworkManager.morph b/strata/NetworkManager-common/NetworkManager.morph
new file mode 100644
index 00000000..9840dfa4
--- /dev/null
+++ b/strata/NetworkManager-common/NetworkManager.morph
@@ -0,0 +1,5 @@
+name: NetworkManager
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --with-session-tracking=systemd --disable-ppp
-- 
cgit v1.2.1