Merge tag 'baserock-15.34'

Conflicts:
	README
	clusters/release.morph
	scripts/release-build

Change-Id: If289bcb168478405400c66717d7f33dcdde63cb6

52 files changed, 200 insertions, 20 deletions

diff --git a/systems/build-system-armv5l-openbmc-aspeed.morph b/systems/build-system-armv5l-openbmc-aspeed.morph
index 7230bbc0..922d49f1 100644
--- a/systems/build-system-armv5l-openbmc-aspeed.morph
+++ b/systems/build-system-armv5l-openbmc-aspeed.morph
@@ -1,7 +1,6 @@
 name: build-system-armv5l-openbmc-aspeed
 kind: system
-description:
-- |
+description: |
   The system that should be used for building other Baserock systems
   for little endian ARMv5 computers.
 arch: armv5l
@@ -14,6 +13,8 @@ strata:
   morph: strata/foundation.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: bsp-armv5l-openbmc-aspeed
   morph: strata/bsp-armv5l-openbmc-aspeed.morph
 - name: tools
@@ -30,6 +31,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 42156d78..fa96ca02 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -1,6 +1,7 @@
 name: build-system-armv7lhf-highbank
 kind: system
-description: The system that should be used for building all other Baserock systems for ARMv7 little-endian hard-float Calxeda Highbank computers.
+description: The system that should be used for building all other Baserock systems
+  for ARMv7 little-endian hard-float Calxeda Highbank computers.
 arch: armv7lhf
 strata:
 - name: build-essential
@@ -11,6 +12,8 @@ strata:
   morph: strata/foundation.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: bsp-armv7-highbank
   morph: strata/bsp-armv7-highbank.morph
 - name: tools
@@ -39,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 3bdcf9f0..2e180a6e 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -1,6 +1,7 @@
 name: build-system-armv7lhf-jetson
 kind: system
-description: The system that should be used for building all other Baserock systems for ARMv7 little-endian hard-float NVIDIA Jetson TK1 computers.
+description: The system that should be used for building all other Baserock systems
+  for ARMv7 little-endian hard-float NVIDIA Jetson TK1 computers.
 arch: armv7lhf
 strata:
 - name: build-essential
@@ -11,6 +12,8 @@ strata:
   morph: strata/foundation.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: bsp-jetson
   morph: strata/bsp-jetson.morph
 - name: tools
@@ -39,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 aa16f545..27757027 100644
--- a/systems/build-system-armv8b64.morph
+++ b/systems/build-system-armv8b64.morph
@@ -1,7 +1,6 @@
 name: build-system-armv8b64
 kind: system
-description:
-- |
+description: |
   The system that should be used for building all other Baserock systems
   for 64-bit ARMv8 computers running in big-endian mode.
 arch: armv8b64
@@ -16,6 +15,8 @@ strata:
   morph: strata/bsp-armv8b64-generic.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: tools
   morph: strata/tools.morph
 - name: python-cliapp
@@ -26,6 +27,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 e7ddf034..2f9560c4 100644
--- a/systems/build-system-armv8l64.morph
+++ b/systems/build-system-armv8l64.morph
@@ -1,7 +1,6 @@
 name: build-system-armv8l64
 kind: system
-description:
-- |
+description: |
   The system that should be used for building all other Baserock systems
   for little endian 64-bit ARMv8 computers.
 arch: armv8l64
@@ -14,6 +13,8 @@ strata:
   morph: strata/foundation.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: bsp-armv8l64-generic
   morph: strata/bsp-armv8l64-generic.morph
 - name: tools
@@ -42,6 +43,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 642df309..5c2851bf 100644
--- a/systems/build-system-ppc64.morph
+++ b/systems/build-system-ppc64.morph
@@ -1,6 +1,7 @@
 name: build-system-ppc64
 kind: system
-description: The system that should be used for building all other Baserock systems for 64-bit POWER computers.
+description: The system that should be used for building all other Baserock systems
+  for 64-bit POWER computers.
 arch: ppc64
 strata:
 - name: build-essential
@@ -11,6 +12,8 @@ strata:
   morph: strata/foundation.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: bsp-ppc64-generic
   morph: strata/bsp-ppc64-generic.morph
 - name: tools
@@ -39,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 646ae6a8..bfd77b8e 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -1,6 +1,7 @@
 name: build-system-x86_32-chroot
 kind: system
-description: The system that should be used for building all other Baserock systems for 32-bit Intel x86 computers, chroot variant.
+description: The system that should be used for building all other Baserock systems
+  for 32-bit Intel x86 computers, chroot variant.
 arch: x86_32
 strata:
 - name: build-essential
@@ -11,6 +12,8 @@ strata:
   morph: strata/foundation.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: tools
   morph: strata/tools.morph
 - name: python-cliapp
@@ -39,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 c14b54f2..fe35055f 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -1,6 +1,7 @@
 name: build-system-x86_32
 kind: system
-description: The system that should be used for building all other Baserock systems for 32-bit Intel x86 computers.
+description: The system that should be used for building all other Baserock systems
+  for 32-bit Intel x86 computers.
 arch: x86_32
 strata:
 - name: build-essential
@@ -11,6 +12,8 @@ strata:
   morph: strata/foundation.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: bsp-x86_32-generic
   morph: strata/bsp-x86_32-generic.morph
 - name: tools
@@ -37,10 +40,10 @@ strata:
   morph: strata/openstack-clients.morph
 - name: devtools
   morph: strata/devtools.morph
-- name: bsp-x86_both-tools
-  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-chroot.morph b/systems/build-system-x86_64-chroot.morph
index 82493d1e..3bbdd914 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -1,6 +1,7 @@
 name: build-system-x86_64-chroot
 kind: system
-description: The system that should be used for building all other Baserock systems for 64-bit Intel x86 computers, chroot variant.
+description: The system that should be used for building all other Baserock systems
+  for 64-bit Intel x86 computers, chroot variant.
 arch: x86_64
 strata:
 - name: build-essential
@@ -11,6 +12,8 @@ strata:
   morph: strata/foundation.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: tools
   morph: strata/tools.morph
 - name: python-cliapp
@@ -39,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 4b688555..b5e39f73 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -1,6 +1,7 @@
 name: build-system-x86_64
 kind: system
-description: The system that should be used for building all other Baserock systems for 64-bit Intel x86 computers.
+description: The system that should be used for building all other Baserock systems
+  for 64-bit Intel x86 computers.
 arch: x86_64
 strata:
 - name: build-essential
@@ -11,6 +12,8 @@ strata:
   morph: strata/foundation.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: bsp-x86_64-generic
   morph: strata/bsp-x86_64-generic.morph
 - name: tools
@@ -37,10 +40,10 @@ strata:
   morph: strata/openstack-clients.morph
 - name: devtools
   morph: strata/devtools.morph
-- name: bsp-x86_both-tools
-  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/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph
index daaa6957..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
@@ -50,6 +52,8 @@ strata:
   morph: strata/nfs.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-common
   morph: strata/python-common.morph
 - name: chef
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 d7a06fe9..6fe76927 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -37,6 +37,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -49,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 854edd76..9305bd55 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -38,6 +38,8 @@ strata:
   morph: strata/nfs.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -50,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 34c9a239..fc1ee9c5 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -38,6 +38,8 @@ strata:
   morph: strata/nfs.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -50,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 300981f9..4d6eabff 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -38,6 +38,8 @@ strata:
   morph: strata/nfs.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -50,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 4eed73e4..01187420 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -29,6 +29,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -41,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 ba5de00b..acd68b5f 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -34,6 +34,8 @@ strata:
   morph: strata/nfs.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -46,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 d0917fcb..180779d9 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -37,6 +37,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -49,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 189c2913..8660e698 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -41,6 +41,8 @@ strata:
   morph: strata/nfs.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -53,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 1c39b3ea..bac4f2ab 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -41,6 +41,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -53,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 4432f947..c11bbbb6 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -41,6 +41,8 @@ strata:
   morph: strata/nfs.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -53,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 44ff2d53..001de4b5 100644
--- a/systems/devel-system-armv8b64.morph
+++ b/systems/devel-system-armv8b64.morph
@@ -42,6 +42,8 @@ strata:
   morph: strata/nfs.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -52,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 cad71c4e..cde9fe18 100644
--- a/systems/devel-system-armv8l64.morph
+++ b/systems/devel-system-armv8l64.morph
@@ -40,6 +40,8 @@ strata:
   morph: strata/nfs.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -52,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 fe437767..59b03bdd 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -35,6 +35,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -47,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 26776429..0a077609 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -38,6 +38,8 @@ strata:
   morph: strata/nfs.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -50,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 bc3872a7..b071abfc 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -37,6 +37,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -49,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 952bff79..9f792f30 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -42,6 +42,8 @@ strata:
   morph: strata/nfs.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -54,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 394201e0..5be9910c 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -39,6 +39,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -51,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 fe56a5de..ae0c97e8 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -42,6 +42,8 @@ strata:
   morph: strata/nfs.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -54,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 b8d4d2e7..4a91f84b 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -40,6 +40,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -52,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 f1a83d6d..860a6231 100644
--- a/systems/installer-system-armv8b64.morph
+++ b/systems/installer-system-armv8b64.morph
@@ -1,6 +1,7 @@
 name: installer-system-armv8b64
 kind: system
-description: The system that should be used as an Installer to install other Baserock systems.
+description: The system that should be used as an Installer to install other Baserock
+  systems.
 arch: armv8b64
 strata:
 - name: build-essential
@@ -9,6 +10,8 @@ strata:
   morph: strata/core.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: bsp-armv8b64-generic
@@ -21,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 e9c4cd94..1e854f33 100644
--- a/systems/installer-system-x86_64.morph
+++ b/systems/installer-system-x86_64.morph
@@ -1,6 +1,7 @@
 name: installer-system-x86_64
 kind: system
-description: The system that should be used as an Installer to install other Baserock systems.
+description: The system that should be used as an Installer to install other Baserock
+  systems.
 arch: x86_64
 strata:
 - name: build-essential
@@ -9,6 +10,8 @@ strata:
   morph: strata/core.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: bsp-x86_64-generic
@@ -21,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 a4ed7643..f0830980 100644
--- a/systems/java-build-system-x86_64-generic.morph
+++ b/systems/java-build-system-x86_64-generic.morph
@@ -45,6 +45,8 @@ strata:
   morph: strata/nfs.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -57,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 2f700e68..8c191be6 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: python3-core
+  morph: strata/python3-core.morph
 - name: python-pygobject
   morph: strata/python-pygobject.morph
 - name: python-common
@@ -59,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
@@ -80,6 +84,7 @@ configuration-extensions:
 - extensions/openstack-network
 - extensions/openstack-neutron
 - extensions/openstack-ceilometer
+- extensions/openstack-time
 - extensions/fstab
 - extensions/openstack-ironic
 - extensions/install-essential-files
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/swift-system-x86_64.morph b/systems/swift-system-x86_64.morph
index c959b6f7..139c0028 100644
--- a/systems/swift-system-x86_64.morph
+++ b/systems/swift-system-x86_64.morph
@@ -17,6 +17,8 @@ strata:
   morph: strata/ntpd.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: python-common
   morph: strata/python-common.morph
 - name: ansible
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index efc66b5c..3ffb8995 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -13,6 +13,8 @@ strata:
   morph: strata/core.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: tools
   morph: strata/tools.morph
 - name: python-cliapp
@@ -23,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 78ddc8b4..652c4690 100644
--- a/systems/weston-system-armv7lhf-jetson.morph
+++ b/systems/weston-system-armv7lhf-jetson.morph
@@ -1,6 +1,7 @@
 name: weston-system-armv7lhf-jetson
 kind: system
-description: A weston system for ARMv7 little-endian hard-float NVIDIA Jetson TK1 computers.
+description: A weston system for ARMv7 little-endian hard-float NVIDIA Jetson TK1
+  computers.
 arch: armv7lhf
 strata:
 - name: build-essential
@@ -41,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 f87b0982..6a1e0b2b 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -9,6 +9,8 @@ strata:
   morph: strata/core.morph
 - name: python-core
   morph: strata/python-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: bsp-x86_64-generic
@@ -41,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