From 39b553e11c1636acb719746ecd6eb41f6eff8369 Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam.coldrick@codethink.co.uk>
Date: Thu, 16 Apr 2015 14:42:45 +0000
Subject: Split PyGObject into its own stratum

Also make morph depend on PyGObject, it will be needed for OSTree.

Change-Id: Icfa9abb95f884ca9b1dd720648567bd704e74d85
---
 strata/morph-utils.morph                |  2 ++
 strata/python-pygobject.morph           | 14 ++++++++++++++
 strata/python-pygobject/pygobject.morph |  5 +++++
 strata/virtualization.morph             |  7 +------
 strata/virtualization/pygobject.morph   |  5 -----
 5 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 strata/python-pygobject.morph
 create mode 100644 strata/python-pygobject/pygobject.morph
 delete mode 100644 strata/virtualization/pygobject.morph

(limited to 'strata')

diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index 99a0562f..77b7cb7a 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -3,6 +3,8 @@ kind: stratum
 build-depends:
 - morph: strata/core.morph
 - morph: strata/python-cliapp.morph
+- morph: strata/python-core.morph
+- morph: strata/python-pygobject.morph
 - morph: strata/python-wsgi.morph
 chunks:
 - name: python-ttystatus
diff --git a/strata/python-pygobject.morph b/strata/python-pygobject.morph
new file mode 100644
index 00000000..a371cccb
--- /dev/null
+++ b/strata/python-pygobject.morph
@@ -0,0 +1,14 @@
+name: python-pygobject
+kind: stratum
+description: |
+  Python GObject bindings
+build-depends:
+- morph: strata/python-core.morph
+# Depends on 'foundation' for GLib
+- morph: strata/foundation.morph
+chunks:
+- name: pygobject
+  morph: strata/python-pygobject/pygobject.morph
+  repo: upstream:pygobject
+  ref: 276341d7ddab180020c31e6837bd28fd25784de0
+  unpetrify-ref: baserock/morph
diff --git a/strata/python-pygobject/pygobject.morph b/strata/python-pygobject/pygobject.morph
new file mode 100644
index 00000000..a423537e
--- /dev/null
+++ b/strata/python-pygobject/pygobject.morph
@@ -0,0 +1,5 @@
+name: pygobject
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-cairo
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 0065e087..9eb11f5e 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -7,6 +7,7 @@ description: |
     or ebtables, for example.
 build-depends:
 - morph: strata/python-core.morph
+- morph: strata/python-pygobject.morph
 - morph: strata/connman-common.morph
 - morph: strata/lvm.morph
 - morph: strata/xorg-util-macros-common.morph
@@ -75,11 +76,6 @@ chunks:
   build-depends:
   - libvirt
   - urlgrabber
-- name: pygobject
-  morph: strata/virtualization/pygobject.morph
-  repo: upstream:pygobject
-  ref: 276341d7ddab180020c31e6837bd28fd25784de0
-  unpetrify-ref: baserock/morph
 - name: libsoup
   morph: strata/virtualization/libsoup.morph
   repo: upstream:libsoup
@@ -92,7 +88,6 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - libsoup
-  - pygobject
 - name: virt-manager
   repo: upstream:virt-manager
   ref: 8b7ebd4538ffbd2d246fdeee4f1bb1c452585575
diff --git a/strata/virtualization/pygobject.morph b/strata/virtualization/pygobject.morph
deleted file mode 100644
index a423537e..00000000
--- a/strata/virtualization/pygobject.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: pygobject
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --disable-cairo
-- 
cgit v1.2.1