summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2015-04-16 14:58:41 (GMT)
committerJavier Jardón <jjardon@gnome.org>2015-04-22 22:20:09 (GMT)
commit71b0af69e6c0c150306c0d276fbc61fd518b8e04 (patch)
tree5bab7c25b6f89fbf0230c8fcb13b00ad635036a3
parent39b553e11c1636acb719746ecd6eb41f6eff8369 (diff)
downloaddefinitions-71b0af69e6c0c150306c0d276fbc61fd518b8e04.tar.gz
Split libsoup into its own stratum
Change-Id: I14177e899e404fdc72728f694f8551d5f8518f4b
-rw-r--r--strata/libsoup-common.morph11
-rw-r--r--strata/libsoup-common/libsoup.morph (renamed from strata/virtualization/libsoup.morph)0
-rw-r--r--strata/virtualization.morph8
-rw-r--r--systems/openstack-system-x86_64.morph2
4 files changed, 14 insertions, 7 deletions
diff --git a/strata/libsoup-common.morph b/strata/libsoup-common.morph
new file mode 100644
index 0000000..b4fdaa8
--- /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/virtualization/libsoup.morph b/strata/libsoup-common/libsoup.morph
index 0a5ebef..0a5ebef 100644
--- a/strata/virtualization/libsoup.morph
+++ b/strata/libsoup-common/libsoup.morph
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 9eb11f5..548019a 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/systems/openstack-system-x86_64.morph b/systems/openstack-system-x86_64.morph
index 1d7cab7..631fedb 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