From 71b0af69e6c0c150306c0d276fbc61fd518b8e04 Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam.coldrick@codethink.co.uk>
Date: Thu, 16 Apr 2015 14:58:41 +0000
Subject: Split libsoup into its own stratum

Change-Id: I14177e899e404fdc72728f694f8551d5f8518f4b
---
 strata/libsoup-common.morph           | 11 +++++++++++
 strata/libsoup-common/libsoup.morph   |  6 ++++++
 strata/virtualization.morph           |  8 +-------
 strata/virtualization/libsoup.morph   |  6 ------
 systems/openstack-system-x86_64.morph |  2 ++
 5 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 strata/libsoup-common.morph
 create mode 100644 strata/libsoup-common/libsoup.morph
 delete mode 100644 strata/virtualization/libsoup.morph

diff --git a/strata/libsoup-common.morph b/strata/libsoup-common.morph
new file mode 100644
index 00000000..b4fdaa87
--- /dev/null
+++ b/strata/libsoup-common.morph
@@ -0,0 +1,11 @@
+name: libsoup-common
+kind: stratum
+build-depends:
+# libsoup depends on foundation for 'glib', and maybe other things.
+- morph: strata/foundation.morph
+chunks:
+- name: libsoup
+  morph: strata/libsoup-common/libsoup.morph
+  repo: upstream:libsoup
+  ref: ce764489e358bad6b49418f5c8bc7b25a4b1815e
+  unpetrify-ref: baserock/morph
diff --git a/strata/libsoup-common/libsoup.morph b/strata/libsoup-common/libsoup.morph
new file mode 100644
index 00000000..0a5ebef6
--- /dev/null
+++ b/strata/libsoup-common/libsoup.morph
@@ -0,0 +1,6 @@
+name: libsoup
+kind: chunk
+build-system: autotools
+configure-commands:
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX" --disable-tls-check
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 9eb11f5e..548019aa 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -6,6 +6,7 @@ description: |
     kernel history to check which config are needed for openvswitch, libvirt,
     or ebtables, for example.
 build-depends:
+- morph: strata/libsoup-common.morph
 - morph: strata/python-core.morph
 - morph: strata/python-pygobject.morph
 - morph: strata/connman-common.morph
@@ -76,18 +77,11 @@ chunks:
   build-depends:
   - libvirt
   - urlgrabber
-- name: libsoup
-  morph: strata/virtualization/libsoup.morph
-  repo: upstream:libsoup
-  ref: ce764489e358bad6b49418f5c8bc7b25a4b1815e
-  unpetrify-ref: baserock/morph
 - name: libosinfo
   morph: strata/virtualization/libosinfo.morph
   repo: upstream:libosinfo
   ref: a86c74c4d3f62bb0e315ab7fc78ec9f7746bdd12
   unpetrify-ref: baserock/morph
-  build-depends:
-  - libsoup
 - name: virt-manager
   repo: upstream:virt-manager
   ref: 8b7ebd4538ffbd2d246fdeee4f1bb1c452585575
diff --git a/strata/virtualization/libsoup.morph b/strata/virtualization/libsoup.morph
deleted file mode 100644
index 0a5ebef6..00000000
--- a/strata/virtualization/libsoup.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: libsoup
-kind: chunk
-build-system: autotools
-configure-commands:
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --disable-tls-check
diff --git a/systems/openstack-system-x86_64.morph b/systems/openstack-system-x86_64.morph
index 1d7cab73..631fedb2 100644
--- a/systems/openstack-system-x86_64.morph
+++ b/systems/openstack-system-x86_64.morph
@@ -57,6 +57,8 @@ strata:
   morph: strata/ansible.morph
 - name: ntpd
   morph: strata/ntpd.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
-- 
cgit v1.2.1