From a340918995a8a09b27b232bb85a611f00e1317cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sun, 21 Jun 2015 19:38:43 +0100 Subject: More GLib and deps to its own stratum Change-Id: I1bcc28de68c9b61b25929cf142e1dd8ea63f8d6f --- strata/audio-bluetooth.morph | 1 + strata/connman-common.morph | 1 + strata/core.morph | 40 ---------------------- strata/glib-common.morph | 24 +++++++++++++ strata/graphics-common.morph | 1 + strata/libsoup-common.morph | 1 + strata/python-pygobject.morph | 1 + strata/tools.morph | 1 + systems/build-system-armv5l-openbmc-aspeed.morph | 2 ++ 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 ++ .../cross-bootstrap-system-armv5l-generic.morph | 2 ++ .../cross-bootstrap-system-armv7lhf-generic.morph | 2 ++ .../cross-bootstrap-system-armv8b64-generic.morph | 2 ++ .../cross-bootstrap-system-armv8l64-generic.morph | 2 ++ systems/cross-bootstrap-system-ppc64-generic.morph | 2 ++ .../cross-bootstrap-system-x86_64-generic.morph | 2 ++ systems/cxmanage-system-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 ++ .../genivi-baseline-system-armv7lhf-jetson.morph | 2 ++ ...genivi-baseline-system-armv7lhf-versatile.morph | 2 ++ .../genivi-baseline-system-x86_64-generic.morph | 2 ++ systems/installer-system-armv8b64.morph | 2 ++ systems/installer-system-x86_64.morph | 2 ++ systems/java-build-system-x86_64-generic.morph | 2 ++ systems/openstack-system-x86_64.morph | 2 ++ systems/qt4-devel-system-x86_64-generic.morph | 2 ++ systems/qt5-devel-system-x86_64-generic.morph | 2 ++ systems/trove-system-x86_64.morph | 2 ++ systems/web-system-x86_64-generic.morph | 2 ++ systems/weston-system-armv7lhf-jetson.morph | 2 ++ systems/weston-system-x86_64-generic.morph | 2 ++ systems/xfce-system.morph | 2 ++ 59 files changed, 132 insertions(+), 40 deletions(-) create mode 100644 strata/glib-common.morph 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 diff --git a/systems/build-system-armv5l-openbmc-aspeed.morph b/systems/build-system-armv5l-openbmc-aspeed.morph index b23d1171..1515b83f 100644 --- a/systems/build-system-armv5l-openbmc-aspeed.morph +++ b/systems/build-system-armv5l-openbmc-aspeed.morph @@ -32,6 +32,8 @@ strata: morph: strata/devtools.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: mtd-utilities diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 0630fe9b..fa96ca02 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -42,6 +42,8 @@ strata: morph: strata/devtools.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: unionfs-fuse-group diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index 632747ce..2e180a6e 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -42,6 +42,8 @@ strata: morph: strata/devtools.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph configuration-extensions: diff --git a/systems/build-system-armv8b64.morph b/systems/build-system-armv8b64.morph index 21e28937..464bdc7b 100644 --- a/systems/build-system-armv8b64.morph +++ b/systems/build-system-armv8b64.morph @@ -28,6 +28,8 @@ strata: morph: strata/python-wsgi.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: morph-utils diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph index b02a98ba..2f636680 100644 --- a/systems/build-system-armv8l64.morph +++ b/systems/build-system-armv8l64.morph @@ -44,6 +44,8 @@ strata: morph: strata/devtools.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph configuration-extensions: diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 4fcf78eb..5c2851bf 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -42,6 +42,8 @@ strata: morph: strata/devtools.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph configuration-extensions: diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index 5269d5cf..bfd77b8e 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -42,6 +42,8 @@ strata: morph: strata/bsp-x86_both-tools.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph configuration-extensions: diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index 58ce09a2..fe35055f 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -42,6 +42,8 @@ strata: morph: strata/devtools.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph configuration-extensions: diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index fa7d4fb8..3bbdd914 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -42,6 +42,8 @@ strata: morph: strata/bsp-x86_both-tools.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph configuration-extensions: diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 28515749..b5e39f73 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -42,6 +42,8 @@ strata: morph: strata/devtools.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph configuration-extensions: diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index f56965c6..9a36b850 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -30,6 +30,8 @@ strata: morph: strata/python-wsgi.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: morph-utils diff --git a/systems/cross-bootstrap-system-armv5l-generic.morph b/systems/cross-bootstrap-system-armv5l-generic.morph index 08cc11f6..e479d150 100644 --- a/systems/cross-bootstrap-system-armv5l-generic.morph +++ b/systems/cross-bootstrap-system-armv5l-generic.morph @@ -13,6 +13,8 @@ strata: morph: strata/python-pygobject.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: morph-utils diff --git a/systems/cross-bootstrap-system-armv7lhf-generic.morph b/systems/cross-bootstrap-system-armv7lhf-generic.morph index e52a0375..280b1e0e 100644 --- a/systems/cross-bootstrap-system-armv7lhf-generic.morph +++ b/systems/cross-bootstrap-system-armv7lhf-generic.morph @@ -13,6 +13,8 @@ strata: morph: strata/python-pygobject.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: morph-utils diff --git a/systems/cross-bootstrap-system-armv8b64-generic.morph b/systems/cross-bootstrap-system-armv8b64-generic.morph index adfbd412..53e9f46b 100644 --- a/systems/cross-bootstrap-system-armv8b64-generic.morph +++ b/systems/cross-bootstrap-system-armv8b64-generic.morph @@ -13,6 +13,8 @@ strata: morph: strata/python-pygobject.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: morph-utils diff --git a/systems/cross-bootstrap-system-armv8l64-generic.morph b/systems/cross-bootstrap-system-armv8l64-generic.morph index 5cc2f83b..1214362f 100644 --- a/systems/cross-bootstrap-system-armv8l64-generic.morph +++ b/systems/cross-bootstrap-system-armv8l64-generic.morph @@ -13,6 +13,8 @@ strata: morph: strata/python-pygobject.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: morph-utils diff --git a/systems/cross-bootstrap-system-ppc64-generic.morph b/systems/cross-bootstrap-system-ppc64-generic.morph index 35b3f626..297f862b 100644 --- a/systems/cross-bootstrap-system-ppc64-generic.morph +++ b/systems/cross-bootstrap-system-ppc64-generic.morph @@ -13,6 +13,8 @@ strata: morph: strata/python-pygobject.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: morph-utils diff --git a/systems/cross-bootstrap-system-x86_64-generic.morph b/systems/cross-bootstrap-system-x86_64-generic.morph index 471bd40d..ef8912ad 100644 --- a/systems/cross-bootstrap-system-x86_64-generic.morph +++ b/systems/cross-bootstrap-system-x86_64-generic.morph @@ -13,6 +13,8 @@ strata: morph: strata/python-pygobject.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: morph-utils diff --git a/systems/cxmanage-system-x86_64-generic.morph b/systems/cxmanage-system-x86_64-generic.morph index ed7e8d63..85f74e4c 100644 --- a/systems/cxmanage-system-x86_64-generic.morph +++ b/systems/cxmanage-system-x86_64-generic.morph @@ -13,6 +13,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph +- name: glib-common + morph: strata/glib-common.morph - name: cxmanage morph: strata/cxmanage.morph configuration-extensions: diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index ab99197e..6fe76927 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -51,6 +51,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 6d8fb56e..9305bd55 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -52,6 +52,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: unionfs-fuse-group diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 622bb602..fc1ee9c5 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -52,6 +52,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index 0206294b..4d6eabff 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -52,6 +52,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 9050cef5..01187420 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -43,6 +43,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 1d2eddb8..acd68b5f 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -48,6 +48,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: unionfs-fuse-group diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 752e5d2c..180779d9 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -51,6 +51,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 699d2ba3..8660e698 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -55,6 +55,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: unionfs-fuse-group diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index 6b3c65e7..bac4f2ab 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -55,6 +55,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index b75176ca..c11bbbb6 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -55,6 +55,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph index 9f304f64..001de4b5 100644 --- a/systems/devel-system-armv8b64.morph +++ b/systems/devel-system-armv8b64.morph @@ -54,6 +54,8 @@ strata: morph: strata/ansible.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph index 29dffdfc..cde9fe18 100644 --- a/systems/devel-system-armv8l64.morph +++ b/systems/devel-system-armv8l64.morph @@ -54,6 +54,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 3bd02477..59b03bdd 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -49,6 +49,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index da80f17a..0a077609 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -52,6 +52,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 649a8645..b071abfc 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -51,6 +51,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index 76a95024..9f792f30 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -56,6 +56,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index 890de847..5be9910c 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -53,6 +53,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index d7e43004..ae0c97e8 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -56,6 +56,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 03f414c3..4a91f84b 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -54,6 +54,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 71247d39..535696f6 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -17,6 +17,8 @@ strata: morph: strata/connman-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph +- name: glib-common + morph: strata/glib-common.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: multimedia-common diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index 429ca2d8..c1425115 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -17,6 +17,8 @@ strata: morph: strata/connman-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph +- name: glib-common + morph: strata/glib-common.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: multimedia-common diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index 6048e078..da0a1b3a 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -17,6 +17,8 @@ strata: morph: strata/connman-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph +- name: glib-common + morph: strata/glib-common.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: multimedia-common diff --git a/systems/installer-system-armv8b64.morph b/systems/installer-system-armv8b64.morph index 7a5fc855..860a6231 100644 --- a/systems/installer-system-armv8b64.morph +++ b/systems/installer-system-armv8b64.morph @@ -24,6 +24,8 @@ strata: morph: strata/python-wsgi.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: morph-utils diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph index 2119d103..1e854f33 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.morph @@ -24,6 +24,8 @@ strata: morph: strata/python-wsgi.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: morph-utils diff --git a/systems/java-build-system-x86_64-generic.morph b/systems/java-build-system-x86_64-generic.morph index cd81f827..f0830980 100644 --- a/systems/java-build-system-x86_64-generic.morph +++ b/systems/java-build-system-x86_64-generic.morph @@ -59,6 +59,8 @@ strata: morph: strata/swift.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: coreutils-common diff --git a/systems/openstack-system-x86_64.morph b/systems/openstack-system-x86_64.morph index 979eae8f..8c191be6 100644 --- a/systems/openstack-system-x86_64.morph +++ b/systems/openstack-system-x86_64.morph @@ -61,6 +61,8 @@ strata: morph: strata/ntpd.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: test-tools morph: strata/test-tools.morph - name: swift diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph index c7bad950..0285fa70 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system-x86_64-generic.morph @@ -20,6 +20,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph +- name: glib-common + morph: strata/glib-common.morph - name: x-common morph: strata/x-common.morph - name: x-generic diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index a1f38e9e..c342ceb9 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -20,6 +20,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph +- name: glib-common + morph: strata/glib-common.morph - name: x-common morph: strata/x-common.morph - name: x-generic diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index f73ba91e..3ffb8995 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -25,6 +25,8 @@ strata: morph: strata/python-wsgi.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: morph-utils diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph index 3f477833..4101f615 100644 --- a/systems/web-system-x86_64-generic.morph +++ b/systems/web-system-x86_64-generic.morph @@ -13,6 +13,8 @@ strata: morph: strata/core.morph - name: tools morph: strata/tools.morph +- name: glib-common + morph: strata/glib-common.morph - name: nfs morph: strata/nfs.morph - name: databases diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph index 2c5dcc19..652c4690 100644 --- a/systems/weston-system-armv7lhf-jetson.morph +++ b/systems/weston-system-armv7lhf-jetson.morph @@ -42,6 +42,8 @@ strata: morph: strata/x-generic.morph - name: tools morph: strata/tools.morph +- name: glib-common + morph: strata/glib-common.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph index d927dd58..0adfa767 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -41,6 +41,8 @@ strata: morph: strata/x-generic.morph - name: tools morph: strata/tools.morph +- name: glib-common + morph: strata/glib-common.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 3c0bd432..6a1e0b2b 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -43,6 +43,8 @@ strata: morph: strata/python-wsgi.morph - name: libsoup-common morph: strata/libsoup-common.morph +- name: glib-common + morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph - name: morph-utils -- cgit v1.2.1