diff options
| author | Javier Jardón <jjardon@gnome.org> | 2015-04-28 14:29:20 +0100 |
|---|---|---|
| committer | Baserock Gerrit <gerrit@baserock.org> | 2015-04-28 13:41:28 +0000 |
| commit | 610d5fa11f9c62f10cdbd0e555468976ab5e3ebd (patch) | |
| tree | a920556cec7b6ad6f5f35f4c1884c261e9ed04d7 | |
| parent | 1d5156078cd8475cd777f1f90127e22f6d340a29 (diff) | |
| download | definitions-610d5fa11f9c62f10cdbd0e555468976ab5e3ebd.tar.gz | |
Move GLib and gobject-introspection to -core
Morph now depend on pygobject (to access ostree features).
Also ostree depends on libsoup.
Both libsoup and pygobject depends on GLib.
morph is in cross-* systems, so we move GLib
to the core stratum to not have to build the entire foundation
stratum in the cross-* systems.
Also the change makes sense as GLib is a dependency of strata
that not necessarily depend on foundation (like
multimedia-gstreamer)
Change-Id: I9d1527b5057c71704ef5a0fe3d3e5f348f2908e5
| -rw-r--r-- | strata/core.morph | 32 | ||||
| -rw-r--r-- | strata/foundation.morph | 22 |
2 files changed, 32 insertions, 22 deletions
diff --git a/strata/core.morph b/strata/core.morph index 9c343b7e..56cdd925 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -287,3 +287,35 @@ chunks: build-depends: - autoconf-tarball - automake +- name: libffi + morph: strata/foundation/libffi.morph + repo: upstream:libffi + ref: 77d4586cc47e8f4c02278afbc220145bba0d442b + unpetrify-ref: baserock/morph + build-depends: + - autoconf-tarball + - automake +- name: glib + repo: upstream:glib + ref: 966ffb16f6bd54cb3d928a55d00d0eda73592094 + unpetrify-ref: 2.44.0 + build-depends: + - autoconf-tarball + - automake + - 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-tarball + - automake + - bison + - cpython + - flex + - glib + - libffi + - pkg-config diff --git a/strata/foundation.morph b/strata/foundation.morph index 3de24fee..c352ef1e 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -35,35 +35,16 @@ chunks: unpetrify-ref: baserock/morph build-depends: - attr -- name: libffi - morph: strata/foundation/libffi.morph - repo: upstream:libffi - ref: 77d4586cc47e8f4c02278afbc220145bba0d442b - unpetrify-ref: baserock/morph - name: pciutils morph: strata/foundation/pciutils.morph repo: upstream:pciutils ref: bae04bd0473c68a2f21b7712a627abb08fd84b29 unpetrify-ref: baserock/morph -- name: glib - repo: upstream:glib - ref: 966ffb16f6bd54cb3d928a55d00d0eda73592094 - unpetrify-ref: 2.44.0 - build-depends: - - libffi -- name: gobject-introspection - repo: upstream:gobject-introspection - ref: c0243e116c5e261c262dded9f4d7726a770c5a19 - unpetrify-ref: GOBJECT_INTROSPECTION_1_44_0 - build-depends: - - glib - name: dbus-pre morph: strata/foundation/dbus-pre.morph repo: upstream:dbus ref: 3c055572ced8f63eb9756caa4b1a19225f22e6ff unpetrify-ref: baserock/dbus-1.8.16-1-g3c05557/genivi/J-1.0 - build-depends: - - glib - name: libgpg-error repo: upstream:libgpg-error ref: a498812d767c59ae2b75b0c985f5280b139e7dc4 @@ -84,7 +65,6 @@ chunks: unpetrify-ref: baserock/v219-729-g163ab29-jetson_btrfs_fixes build-depends: - dbus-pre - - gobject-introspection - kmod - libcap2 - libgcrypt @@ -139,7 +119,6 @@ chunks: ref: 3c055572ced8f63eb9756caa4b1a19225f22e6ff unpetrify-ref: baserock/dbus-1.8.16-1-g3c05557/genivi/J-1.0 build-depends: - - glib - systemd - name: openssh morph: strata/foundation/openssh.morph @@ -161,7 +140,6 @@ chunks: unpetrify-ref: dbus-glib_0.102 build-depends: - dbus - - glib - name: rsync morph: strata/foundation/rsync.morph repo: upstream:rsync |