Merge tag 'baserock-15.47'

Baserock release 15.47

51 files changed, 557 insertions, 157 deletions

diff --git a/systems/base-system-armv7l-altera-socfpga-devkit.morph b/systems/base-system-armv7l-altera-socfpga-devkit.morph
new file mode 100644
index 00000000..b8fe4c28
--- /dev/null
+++ b/systems/base-system-armv7l-altera-socfpga-devkit.morph
@@ -0,0 +1,21 @@
+name: base-system-armv7l-altera-socfpga-devkit
+kind: system
+description: |
+  The set of strata required to have a minimal system for use on Altera SoCFPGA
+  development kit, using little-endian word order.
+arch: armv7lhf
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv7l-altera-socfpga-devkit
+  morph: strata/bsp-armv7l-altera-socfpga-devkit.morph
+configuration-extensions:
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/build-system-armv5l-openbmc-aspeed.morph b/systems/build-system-armv5l-openbmc-aspeed.morph
index 922d49f1..699f8b7e 100644
--- a/systems/build-system-armv5l-openbmc-aspeed.morph
+++ b/systems/build-system-armv5l-openbmc-aspeed.morph
@@ -11,10 +11,8 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: bsp-armv5l-openbmc-aspeed
   morph: strata/bsp-armv5l-openbmc-aspeed.morph
 - name: tools
diff --git a/systems/build-system-armv7l-altera-socfpga-devkit.morph b/systems/build-system-armv7l-altera-socfpga-devkit.morph
new file mode 100644
index 00000000..813392cb
--- /dev/null
+++ b/systems/build-system-armv7l-altera-socfpga-devkit.morph
@@ -0,0 +1,48 @@
+name: build-system-armv7l-altera-socfpga-devkit
+kind: system
+description: |
+  The system that should be used for building other Baserock systems. For
+  use on Altera SoCFPGA development kit, using little-endian word order.
+arch: armv7lhf
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv7l-altera-socfpga-devkit
+  morph: strata/bsp-armv7l-altera-socfpga-devkit.morph
+- name: python2-core
+  morph: strata/python2-core.morph
+- name: tools
+  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
+  morph: strata/morph-utils.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: python-common
+  morph: strata/python-common.morph
+- name: ansible
+  morph: strata/ansible.morph
+- name: devtools
+  morph: strata/devtools.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
+configuration-extensions:
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/distbuild
+- extensions/fstab
+- extensions/mason
+- extensions/install-essential-files
diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
index fa96ca02..752655af 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -10,10 +10,8 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: bsp-armv7-highbank
   morph: strata/bsp-armv7-highbank.morph
 - name: tools
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph
index 2e180a6e..928d4c9f 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -10,10 +10,8 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: bsp-jetson
   morph: strata/bsp-jetson.morph
 - name: tools
diff --git a/systems/build-system-armv7lhf-rootfs.morph b/systems/build-system-armv7lhf-rootfs.morph
new file mode 100644
index 00000000..0cdfc804
--- /dev/null
+++ b/systems/build-system-armv7lhf-rootfs.morph
@@ -0,0 +1,54 @@
+name: build-system-armv7lhf-rootfs
+kind: system
+description: The system that should be used for building all other Baserock systems
+  for ARMv7 little-endian hard-float, rootfs variant.
+arch: armv7lhf
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: python2-core
+  morph: strata/python2-core.morph
+- name: tools
+  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
+  morph: strata/morph-utils.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: python-common
+  morph: strata/python-common.morph
+- name: ansible
+  morph: strata/ansible.morph
+- name: cloudinit-support
+  morph: strata/cloudinit-support.morph
+- name: openstack-common
+  morph: strata/openstack-common.morph
+- name: openstack-clients
+  morph: strata/openstack-clients.morph
+- name: devtools
+  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:
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/distbuild
+- extensions/fstab
+- extensions/mason
+- extensions/cloud-init
+- extensions/install-essential-files
diff --git a/systems/build-system-armv8b64.morph b/systems/build-system-armv8b64.morph
index 27757027..75864921 100644
--- a/systems/build-system-armv8b64.morph
+++ b/systems/build-system-armv8b64.morph
@@ -13,10 +13,8 @@ strata:
   morph: strata/foundation.morph
 - name: bsp-armv8b64-generic
   morph: strata/bsp-armv8b64-generic.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: tools
   morph: strata/tools.morph
 - name: python-cliapp
diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph
index 2f9560c4..da6e45a1 100644
--- a/systems/build-system-armv8l64.morph
+++ b/systems/build-system-armv8l64.morph
@@ -11,10 +11,8 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: bsp-armv8l64-generic
   morph: strata/bsp-armv8l64-generic.morph
 - name: tools
diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph
index 5c2851bf..0e8bcfc1 100644
--- a/systems/build-system-ppc64.morph
+++ b/systems/build-system-ppc64.morph
@@ -10,10 +10,8 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: bsp-ppc64-generic
   morph: strata/bsp-ppc64-generic.morph
 - name: tools
diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph
index bfd77b8e..ba2d6b04 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -10,10 +10,8 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: tools
   morph: strata/tools.morph
 - name: python-cliapp
diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph
index fe35055f..61d339da 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -10,10 +10,8 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: bsp-x86_32-generic
   morph: strata/bsp-x86_32-generic.morph
 - name: tools
diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph
index 3bbdd914..48463cd2 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -10,10 +10,8 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: tools
   morph: strata/tools.morph
 - name: python-cliapp
diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph
index b5e39f73..0abf5925 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -10,10 +10,8 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: bsp-x86_64-generic
   morph: strata/bsp-x86_64-generic.morph
 - name: tools
diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph
index 9a36b850..803d002f 100644
--- a/systems/ceph-service-x86_64-generic.morph
+++ b/systems/ceph-service-x86_64-generic.morph
@@ -50,10 +50,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-common
   morph: strata/python-common.morph
 - name: chef
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 6fe76927..9a5f48f2 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -35,10 +35,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -57,6 +55,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index 9305bd55..fd0cdfcb 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -36,10 +36,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -60,6 +58,8 @@ strata:
   morph: strata/unionfs-fuse-group.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index fc1ee9c5..423648c9 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -36,10 +36,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -58,6 +56,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 4d6eabff..7e594710 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -36,10 +36,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -58,6 +56,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 01187420..0c9344c1 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -27,10 +27,8 @@ strata:
   morph: strata/openstack-clients.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -49,6 +47,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index acd68b5f..4bd34876 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -32,10 +32,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -56,6 +54,8 @@ strata:
   morph: strata/unionfs-fuse-group.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7l-altera-socfpga-devkit.morph b/systems/devel-system-armv7l-altera-socfpga-devkit.morph
new file mode 100644
index 00000000..94f85ec2
--- /dev/null
+++ b/systems/devel-system-armv7l-altera-socfpga-devkit.morph
@@ -0,0 +1,62 @@
+name: devel-system-armv7l-altera-socfpga-devkit
+kind: system
+description: |
+  A system with useful tools for doing Baserock development.
+
+  For use on Altera SoCFPGA development kit, using little-endian word
+  order.
+arch: armv7lhf
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-armv7l-altera-socfpga-devkit
+  morph: strata/bsp-armv7l-altera-socfpga-devkit.morph
+- name: tools
+  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
+  morph: strata/morph-utils.morph
+- name: nodejs
+  morph: strata/nodejs.morph
+- name: ruby
+  morph: strata/ruby.morph
+- name: lorry
+  morph: strata/lorry.morph
+- name: baserock-import
+  morph: strata/baserock-import.morph
+- name: nfs
+  morph: strata/nfs.morph
+- name: python2-core
+  morph: strata/python2-core.morph
+- name: python-tools
+  morph: strata/python-tools.morph
+- name: python-common
+  morph: strata/python-common.morph
+- name: devtools
+  morph: strata/devtools.morph
+- name: ansible
+  morph: strata/ansible.morph
+- name: swift
+  morph: strata/swift.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
+configuration-extensions:
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 180779d9..203d5ef8 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -35,10 +35,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -57,6 +55,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index 8660e698..c0ccfa66 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -39,10 +39,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -63,6 +61,8 @@ strata:
   morph: strata/unionfs-fuse-group.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index bac4f2ab..14bc1b27 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -39,10 +39,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -61,6 +59,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index c11bbbb6..6cf81846 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -39,10 +39,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -61,6 +59,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph
index 001de4b5..ab8dcd1b 100644
--- a/systems/devel-system-armv8b64.morph
+++ b/systems/devel-system-armv8b64.morph
@@ -40,10 +40,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -60,6 +58,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph
index cde9fe18..3cf21388 100644
--- a/systems/devel-system-armv8l64.morph
+++ b/systems/devel-system-armv8l64.morph
@@ -38,10 +38,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -60,6 +58,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index 59b03bdd..5e4c5f98 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -33,10 +33,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -55,6 +53,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index 0a077609..be76353c 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -36,10 +36,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -58,6 +56,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index b071abfc..bcd0acfc 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -35,10 +35,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -57,6 +55,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index 9f792f30..c03c8b73 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -40,10 +40,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -62,6 +60,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 5be9910c..49fc75af 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -37,10 +37,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -59,6 +57,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index ae0c97e8..5ee32cc2 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -40,10 +40,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -62,6 +60,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index 4a91f84b..e142c7c5 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -38,10 +38,8 @@ strata:
   morph: strata/lorry.morph
 - name: baserock-import
   morph: strata/baserock-import.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
@@ -60,6 +58,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: compilers-extra
+  morph: strata/compilers-extra.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph
index 535696f6..59e2c86f 100644
--- a/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph
@@ -31,8 +31,8 @@ strata:
   morph: strata/wayland-generic.morph
 - name: graphics-common
   morph: strata/graphics-common.morph
-- name: input-common
-  morph: strata/input-common.morph
+- name: input-genivi
+  morph: strata/input-genivi.morph
 - name: mesa-common
   morph: strata/mesa-common.morph
 - name: x-common
@@ -47,3 +47,4 @@ configuration-extensions:
 - extensions/strip-gplv3
 - extensions/fstab
 - extensions/install-essential-files
+- extensions/genivi
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index c1425115..6a69e3b2 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -31,8 +31,8 @@ strata:
   morph: strata/wayland-generic.morph
 - name: graphics-common
   morph: strata/graphics-common.morph
-- name: input-common
-  morph: strata/input-common.morph
+- name: input-genivi
+  morph: strata/input-genivi.morph
 - name: x-common
   morph: strata/x-common.morph
 - name: weston-genivi
@@ -45,3 +45,4 @@ configuration-extensions:
 - extensions/strip-gplv3
 - extensions/fstab
 - extensions/install-essential-files
+- extensions/genivi
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index da0a1b3a..693437b4 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -31,8 +31,8 @@ strata:
   morph: strata/wayland-generic.morph
 - name: graphics-common
   morph: strata/graphics-common.morph
-- name: input-common
-  morph: strata/input-common.morph
+- name: input-genivi
+  morph: strata/input-genivi.morph
 - name: llvm-common
   morph: strata/llvm-common.morph
 - name: mesa-common
@@ -48,3 +48,4 @@ configuration-extensions:
 - extensions/install-files
 - extensions/strip-gplv3
 - extensions/install-essential-files
+- extensions/genivi
diff --git a/systems/genivi-demo-platform-armv7lhf-jetson.morph b/systems/genivi-demo-platform-armv7lhf-jetson.morph
new file mode 100644
index 00000000..d683a33e
--- /dev/null
+++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph
@@ -0,0 +1,71 @@
+name: genivi-demo-platform-armv7lhf-jetson
+kind: system
+description: A GENIVI demo platform for a 64-bit x86 system.
+arch: armv7lhf
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
+- name: glib-common
+  morph: strata/glib-common.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-jetson
+  morph: strata/bsp-jetson.morph
+- name: connectivity
+  morph: strata/connectivity.morph
+- name: connman-common
+  morph: strata/connman-common.morph
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: libdrm-common
+  morph: strata/libdrm-common.morph
+- name: multimedia-common
+  morph: strata/multimedia-common.morph
+- name: multimedia-gstreamer
+  morph: strata/multimedia-gstreamer.morph
+- name: genivi
+  morph: strata/genivi.morph
+- name: wayland-generic
+  morph: strata/wayland-generic.morph
+- name: graphics-common
+  morph: strata/graphics-common.morph
+- name: input-genivi
+  morph: strata/input-genivi.morph
+- name: mesa-common
+  morph: strata/mesa-common.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: weston-genivi
+  morph: strata/weston-genivi.morph
+- name: ruby
+  morph: strata/ruby.morph
+- name: icu-common
+  morph: strata/icu-common.morph
+- name: qt5-tools
+  morph: strata/qt5-tools.morph
+- name: qt5-tools-qtmultimedia
+  morph: strata/qt5-tools-qtmultimedia.morph
+- name: qt5-tools-qtwebkit
+  morph: strata/qt5-tools-qtwebkit.morph
+- name: qt5-tools-qtwayland-genivi
+  morph: strata/qt5-tools-qtwayland-genivi.morph
+- name: python-pygobject
+  morph: strata/python-pygobject.morph
+- name: genivi-demo-platform-libs
+  morph: strata/genivi-demo-platform-libs.morph
+- name: genivi-demo-platform
+  morph: strata/genivi-demo-platform.morph
+- name: tools
+  morph: strata/tools.morph
+configuration-extensions:
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
+- extensions/genivi
diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph
new file mode 100644
index 00000000..7b92faf1
--- /dev/null
+++ b/systems/genivi-demo-platform-x86_64-generic.morph
@@ -0,0 +1,73 @@
+name: genivi-demo-platform-x86_64-generic
+kind: system
+description: A GENIVI demo platform for a 64-bit x86 system.
+arch: x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
+- name: glib-common
+  morph: strata/glib-common.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: connectivity
+  morph: strata/connectivity.morph
+- name: connman-common
+  morph: strata/connman-common.morph
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: libdrm-common
+  morph: strata/libdrm-common.morph
+- name: multimedia-common
+  morph: strata/multimedia-common.morph
+- name: multimedia-gstreamer
+  morph: strata/multimedia-gstreamer.morph
+- name: genivi
+  morph: strata/genivi.morph
+- name: wayland-generic
+  morph: strata/wayland-generic.morph
+- name: graphics-common
+  morph: strata/graphics-common.morph
+- name: input-genivi
+  morph: strata/input-genivi.morph
+- name: llvm-common
+  morph: strata/llvm-common.morph
+- name: mesa-common
+  morph: strata/mesa-common.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: weston-genivi
+  morph: strata/weston-genivi.morph
+- name: ruby
+  morph: strata/ruby.morph
+- name: icu-common
+  morph: strata/icu-common.morph
+- name: qt5-tools
+  morph: strata/qt5-tools.morph
+- name: qt5-tools-qtmultimedia
+  morph: strata/qt5-tools-qtmultimedia.morph
+- name: qt5-tools-qtwebkit
+  morph: strata/qt5-tools-qtwebkit.morph
+- name: qt5-tools-qtwayland-genivi
+  morph: strata/qt5-tools-qtwayland-genivi.morph
+- name: python-pygobject
+  morph: strata/python-pygobject.morph
+- name: genivi-demo-platform-libs
+  morph: strata/genivi-demo-platform-libs.morph
+- name: genivi-demo-platform
+  morph: strata/genivi-demo-platform.morph
+- name: tools
+  morph: strata/tools.morph
+configuration-extensions:
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
+- extensions/genivi
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
new file mode 100644
index 00000000..3166a486
--- /dev/null
+++ b/systems/gnome-system-x86_64.morph
@@ -0,0 +1,78 @@
+name: gnome-system-x86_64
+kind: system
+description: A GNOME system system.
+arch: x86_64
+strata:
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: NetworkManager-common
+  morph: strata/NetworkManager-common.morph
+- name: core
+  morph: strata/core.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: glib-common
+  morph: strata/glib-common.morph
+- name: gnome
+  morph: strata/gnome.morph
+- name: graphics-common
+  morph: strata/graphics-common.morph
+- name: gtk-deps
+  morph: strata/gtk-deps.morph
+- name: gtk2
+  morph: strata/gtk2.morph
+- name: gtk3
+  morph: strata/gtk3.morph
+- name: input-common
+  morph: strata/input-common.morph
+- name: llvm-common
+  morph: strata/llvm-common.morph
+- name: mesa-common
+  morph: strata/mesa-common.morph
+- name: multimedia-common
+  morph: strata/multimedia-common.morph
+- name: multimedia-gstreamer
+  morph: strata/multimedia-gstreamer.morph
+- name: python2-core
+  morph: strata/python2-core.morph
+- name: python-pygobject
+  morph: strata/python-pygobject.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ruby
+  morph: strata/ruby.morph
+- name: tools
+  morph: strata/tools.morph
+- name: libdrm-common
+  morph: strata/libdrm-common.morph
+- name: wayland-generic
+  morph: strata/wayland-generic.morph
+- name: weston-common
+  morph: strata/weston-common.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: x-drivers
+  morph: strata/x-drivers.morph
+- name: x-generic
+  morph: strata/x-generic.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
+- name: xdg-app-common
+  morph: strata/xdg-app-common.morph
+- name: network-security
+  morph: strata/network-security.morph
+- name: icu-common
+  morph: strata/icu-common.morph
+- name: samba
+  morph: strata/samba.morph
+- name: cups
+  morph: strata/cups.morph
+configuration-extensions:
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/installer-system-armv8b64.morph b/systems/installer-system-armv8b64.morph
index 860a6231..824e2dab 100644
--- a/systems/installer-system-armv8b64.morph
+++ b/systems/installer-system-armv8b64.morph
@@ -8,10 +8,8 @@ strata:
   morph: strata/build-essential.morph
 - name: core
   morph: strata/core.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: bsp-armv8b64-generic
diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph
index 1e854f33..aa102c15 100644
--- a/systems/installer-system-x86_64.morph
+++ b/systems/installer-system-x86_64.morph
@@ -8,10 +8,8 @@ strata:
   morph: strata/build-essential.morph
 - name: core
   morph: strata/core.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: bsp-x86_64-generic
diff --git a/systems/java-build-system-x86_64-generic.morph b/systems/java-build-system-x86_64-generic.morph
index f0830980..b60637ba 100644
--- a/systems/java-build-system-x86_64-generic.morph
+++ b/systems/java-build-system-x86_64-generic.morph
@@ -43,10 +43,8 @@ strata:
   morph: strata/baserock-import.morph
 - name: nfs
   morph: strata/nfs.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-tools
   morph: strata/python-tools.morph
 - name: python-common
diff --git a/systems/nodejs-system-x86_64.morph b/systems/nodejs-system-x86_64.morph
index b758d5bd..7fba330b 100644
--- a/systems/nodejs-system-x86_64.morph
+++ b/systems/nodejs-system-x86_64.morph
@@ -12,6 +12,8 @@ strata:
   morph: strata/foundation.morph
 - name: bsp-x86_64-generic
   morph: strata/bsp-x86_64-generic.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: nodejs
   morph: strata/nodejs.morph
 configuration-extensions:
diff --git a/systems/openstack-system-x86_64.morph b/systems/openstack-system-x86_64.morph
index 8c191be6..7cb8c20f 100644
--- a/systems/openstack-system-x86_64.morph
+++ b/systems/openstack-system-x86_64.morph
@@ -7,10 +7,8 @@ strata:
   morph: strata/build-essential.morph
 - name: core
   morph: strata/core.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: python-pygobject
   morph: strata/python-pygobject.morph
 - name: python-common
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
index 0285fa70..e8230c88 100644
--- a/systems/qt4-devel-system-x86_64-generic.morph
+++ b/systems/qt4-devel-system-x86_64-generic.morph
@@ -38,6 +38,8 @@ strata:
   morph: strata/connman-common.morph
 - name: enlightenment
   morph: strata/enlightenment.morph
+- name: icu-common
+  morph: strata/icu-common.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index c342ceb9..b68faf79 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -40,6 +40,8 @@ strata:
   morph: strata/connman-common.morph
 - name: enlightenment
   morph: strata/enlightenment.morph
+- name: icu-common
+  morph: strata/icu-common.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/swift-system-x86_64.morph b/systems/swift-system-x86_64.morph
index 139c0028..f850ec45 100644
--- a/systems/swift-system-x86_64.morph
+++ b/systems/swift-system-x86_64.morph
@@ -15,10 +15,8 @@ strata:
   morph: strata/swift.morph
 - name: ntpd
   morph: strata/ntpd.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-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 3ffb8995..bd0a0ff4 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -11,10 +11,8 @@ strata:
   morph: strata/foundation.morph
 - name: core
   morph: strata/core.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: tools
   morph: strata/tools.morph
 - name: python-cliapp
diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph
index 4101f615..090abcbe 100644
--- a/systems/web-system-x86_64-generic.morph
+++ b/systems/web-system-x86_64-generic.morph
@@ -29,8 +29,12 @@ strata:
   morph: strata/erlang.morph
 - name: ruby
   morph: strata/ruby.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: nodejs
   morph: strata/nodejs.morph
+- name: icu-common
+  morph: strata/icu-common.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/xfce-system.morph b/systems/xfce-system-x86_64.morph
index 6a1e0b2b..fedddd57 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system-x86_64.morph
@@ -1,16 +1,16 @@
 name: xfce-system
 kind: system
-description: A GENIVI devel with XFCE
+description: A system with the XFCE desktop
 arch: x86_64
 strata:
 - name: build-essential
   morph: strata/build-essential.morph
 - name: core
   morph: strata/core.morph
-- name: python-core
-  morph: strata/python-core.morph
-- name: python3-core
-  morph: strata/python3-core.morph
+- name: coreutils-common
+  morph: strata/coreutils-common.morph
+- name: python2-core
+  morph: strata/python2-core.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: bsp-x86_64-generic
@@ -19,22 +19,36 @@ strata:
   morph: strata/connectivity.morph
 - name: connman-common
   morph: strata/connman-common.morph
+- name: input-common
+  morph: strata/input-common.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
+- name: libdrm-common
+  morph: strata/libdrm-common.morph
+- name: mesa-common
+  morph: strata/mesa-common.morph
+- name: graphics-common
+  morph: strata/graphics-common.morph
+- name: wayland-generic
+  morph: strata/wayland-generic.morph
 - name: x-common
   morph: strata/x-common.morph
 - name: x-generic
   morph: strata/x-generic.morph
+- name: x-drivers
+  morph: strata/x-drivers.morph
 - name: multimedia-common
   morph: strata/multimedia-common.morph
 - name: multimedia-gstreamer
   morph: strata/multimedia-gstreamer.morph
-- name: genivi
-  morph: strata/genivi.morph
+- name: gtk-deps
+  morph: strata/gtk-deps.morph
 - name: gtk2
   morph: strata/gtk2.morph
 - name: tools
   morph: strata/tools.morph
+- name: devtools
+  morph: strata/devtools.morph
 - name: python-cliapp
   morph: strata/python-cliapp.morph
 - name: python-pygobject