From 39b553e11c1636acb719746ecd6eb41f6eff8369 Mon Sep 17 00:00:00 2001 From: Adam Coldrick 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 ----- systems/build-system-armv7lhf-highbank.morph | 2 ++ systems/build-system-armv7lhf-jetson.morph | 2 ++ systems/build-system-armv8b64.morph | 2 ++ systems/build-system-armv8l64.morph | 2 ++ systems/build-system-ppc64.morph | 2 ++ systems/build-system-x86_32-chroot.morph | 2 ++ systems/build-system-x86_32.morph | 2 ++ systems/build-system-x86_64-chroot.morph | 2 ++ systems/build-system-x86_64.morph | 2 ++ systems/ceph-service-x86_64-generic.morph | 2 ++ systems/devel-system-armv7-chroot.morph | 2 ++ systems/devel-system-armv7-highbank.morph | 2 ++ systems/devel-system-armv7-versatile.morph | 2 ++ systems/devel-system-armv7-wandboard.morph | 2 ++ systems/devel-system-armv7b-chroot.morph | 2 ++ systems/devel-system-armv7b-highbank.morph | 2 ++ systems/devel-system-armv7lhf-chroot.morph | 2 ++ systems/devel-system-armv7lhf-highbank.morph | 2 ++ systems/devel-system-armv7lhf-jetson.morph | 2 ++ systems/devel-system-armv7lhf-wandboard.morph | 2 ++ systems/devel-system-armv8b64.morph | 2 ++ systems/devel-system-armv8l64.morph | 2 ++ systems/devel-system-ppc64-chroot.morph | 2 ++ systems/devel-system-ppc64-generic.morph | 2 ++ systems/devel-system-x86_32-chroot.morph | 2 ++ systems/devel-system-x86_32-generic.morph | 2 ++ systems/devel-system-x86_64-chroot.morph | 2 ++ systems/devel-system-x86_64-generic.morph | 2 ++ systems/devel-system-x86_64-vagrant.morph | 2 ++ systems/installer-system-armv8b64.morph | 2 ++ systems/installer-system-x86_64.morph | 2 ++ systems/openstack-system-x86_64.morph | 2 ++ systems/trove-system-x86_64.morph | 2 ++ systems/xfce-system.morph | 2 ++ 39 files changed, 90 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 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 diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index b9ee8e79..017c08c6 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -19,6 +19,8 @@ strata: morph: strata/python-cliapp.morph - name: python-wsgi morph: strata/python-wsgi.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index 6c59cb28..8b2cdc97 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/build-system-armv8b64.morph b/systems/build-system-armv8b64.morph index b79487e5..242e9c93 100644 --- a/systems/build-system-armv8b64.morph +++ b/systems/build-system-armv8b64.morph @@ -20,6 +20,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph index 63dcb432..b2b432f8 100644 --- a/systems/build-system-armv8l64.morph +++ b/systems/build-system-armv8l64.morph @@ -20,6 +20,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 600eb683..c8471f40 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index 61bf4eaf..4aa33cc5 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -15,6 +15,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index f485287e..21d0b798 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index e8cd7b87..a9d8bd06 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -15,6 +15,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index b9433409..21d20f50 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index 95b17dc0..59423303 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -24,6 +24,8 @@ strata: morph: strata/ntpd.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index 18f82d3b..cb638601 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 40303dce..0f3e87d9 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 8f689705..57eec8c2 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index f139ebc4..7dceb691 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 5ce8c9c7..5859a0f2 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 51de3509..6ff4744d 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index e6db8b26..b1979389 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 03ad8fd0..f910ad92 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -19,6 +19,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index a07a66d2..ebd4b07e 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index b2191c8c..8ebe4a16 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -19,6 +19,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph index c5e32beb..d38fc13c 100644 --- a/systems/devel-system-armv8b64.morph +++ b/systems/devel-system-armv8b64.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph index 64df4716..d0492c73 100644 --- a/systems/devel-system-armv8l64.morph +++ b/systems/devel-system-armv8l64.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 0c4f3b46..d14fb125 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index 6ad076ea..116de32c 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 5e2e11bf..0191be0b 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index 2a6f8178..82fecd35 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index e679cca3..eb7df420 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index 82fc0cae..026c9964 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 647e627c..bccfd111 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/installer-system-armv8b64.morph b/systems/installer-system-armv8b64.morph index b2606aee..22596a64 100644 --- a/systems/installer-system-armv8b64.morph +++ b/systems/installer-system-armv8b64.morph @@ -15,6 +15,8 @@ strata: morph: strata/bsp-armv8b64-generic.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph index cea09c09..0e464b9b 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.morph @@ -15,6 +15,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/openstack-system-x86_64.morph b/systems/openstack-system-x86_64.morph index ecd99cc7..1d7cab73 100644 --- a/systems/openstack-system-x86_64.morph +++ b/systems/openstack-system-x86_64.morph @@ -9,6 +9,8 @@ strata: morph: strata/core.morph - name: python-core morph: strata/python-core.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-common morph: strata/python-common.morph - name: foundation diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index ab50f7f6..680e5ded 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index dad3d3dc..6a33055f 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -35,6 +35,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils -- cgit v1.2.1