More GLib and deps to its own stratum

Change-Id: I1bcc28de68c9b61b25929cf142e1dd8ea63f8d6f

8 files changed, 30 insertions, 40 deletions

diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index 395f79f7..ee1e537c 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -2,6 +2,7 @@ name: audio-bluetooth
 kind: stratum
 description: Components required for audio and bluetooth.
 build-depends:
+- morph: strata/glib-common.morph
 - morph: strata/foundation.morph
 chunks:
 - name: libatomic_ops
diff --git a/strata/connman-common.morph b/strata/connman-common.morph
index a22b7e90..fde00436 100644
--- a/strata/connman-common.morph
+++ b/strata/connman-common.morph
@@ -2,6 +2,7 @@ name: connman-common
 kind: stratum
 build-depends:
 - morph: strata/connectivity.morph
+- morph: strata/glib-common.morph
 chunks:
 - name: connman
   morph: strata/connman-common/connman.morph
diff --git a/strata/core.morph b/strata/core.morph
index 93ac335f..9e4fd4e1 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -166,12 +166,6 @@ chunks:
   unpetrify-ref: 0.22
   build-depends:
   - cpython
-- name: gtk-doc-stub
-  repo: upstream:gtk-doc-stub
-  ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - bash
 # Note: bison's version number must be set in bison's chunk morph,
 # so if you update bison be sure to also update the version number
 # in strata/core/bison.morph
@@ -397,40 +391,6 @@ chunks:
   - automake
   - file
   - libxml2
-- name: gnome-common
-  repo: upstream:gnome-common
-  ref: 5d61b55e8bea32fe2b52e21682ee4b3719b290c5
-  unpetrify-ref: 3.14.0
-  build-depends:
-  - autoconf
-  - automake
-- name: glib
-  repo: upstream:glib
-  ref: 966ffb16f6bd54cb3d928a55d00d0eda73592094
-  unpetrify-ref: 2.44.0
-  build-depends:
-  - autoconf
-  - automake
-  - file
-  - cpython
-  - gettext-tarball
-  - libffi
-  - pkg-config
-- name: gobject-introspection
-  repo: upstream:gobject-introspection
-  ref: c0243e116c5e261c262dded9f4d7726a770c5a19
-  unpetrify-ref: GOBJECT_INTROSPECTION_1_44_0
-  build-depends:
-  - autoconf
-  - automake
-  - file
-  - bash
-  - bison
-  - cpython
-  - flex
-  - glib
-  - libffi
-  - pkg-config
 - name: e2fsprogs
   morph: strata/core/e2fsprogs.morph
   repo: upstream:e2fsprogs
diff --git a/strata/glib-common.morph b/strata/glib-common.morph
new file mode 100644
index 00000000..090bdf13
--- /dev/null
+++ b/strata/glib-common.morph
@@ -0,0 +1,24 @@
+name: glib-common
+kind: stratum
+description: GLib and dependencies
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: gtk-doc-stub
+  repo: upstream:gtk-doc-stub
+  ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0
+  unpetrify-ref: baserock/morph
+- name: gnome-common
+  repo: upstream:gnome-common
+  ref: 5d61b55e8bea32fe2b52e21682ee4b3719b290c5
+  unpetrify-ref: 3.14.0
+- name: glib
+  repo: upstream:glib
+  ref: 966ffb16f6bd54cb3d928a55d00d0eda73592094
+  unpetrify-ref: 2.44.0
+- name: gobject-introspection
+  repo: upstream:gobject-introspection
+  ref: c0243e116c5e261c262dded9f4d7726a770c5a19
+  unpetrify-ref: GOBJECT_INTROSPECTION_1_44_0
+  build-depends:
+  - glib
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index c23ec829..5ba4d200 100644
--- a/strata/graphics-common.morph
+++ b/strata/graphics-common.morph
@@ -1,6 +1,7 @@
 name: graphics-common
 kind: stratum
 build-depends:
+- morph: strata/glib-common.morph
 - morph: strata/mesa-common.morph
 - morph: strata/x-common.morph
 chunks:
diff --git a/strata/libsoup-common.morph b/strata/libsoup-common.morph
index a3fffed8..759a842c 100644
--- a/strata/libsoup-common.morph
+++ b/strata/libsoup-common.morph
@@ -2,6 +2,7 @@ name: libsoup-common
 kind: stratum
 build-depends:
 - morph: strata/core.morph
+- morph: strata/glib-common.morph
 chunks:
 - name: libsoup
   morph: strata/libsoup-common/libsoup.morph
diff --git a/strata/python-pygobject.morph b/strata/python-pygobject.morph
index 39f74f6d..53e9fd72 100644
--- a/strata/python-pygobject.morph
+++ b/strata/python-pygobject.morph
@@ -4,6 +4,7 @@ description: |
   Python GObject bindings
 build-depends:
 - morph: strata/core.morph
+- morph: strata/glib-common.morph
 chunks:
 - name: pygobject
   morph: strata/python-pygobject/pygobject.morph
diff --git a/strata/tools.morph b/strata/tools.morph
index e5eb89b0..bfde546f 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -3,6 +3,7 @@ kind: stratum
 description: Various tools
 build-depends:
 - morph: strata/core.morph
+- morph: strata/glib-common.morph
 chunks:
 - name: distcc
   morph: strata/tools/distcc.morph