Include the BuildStream build tool in Baserock 'build' and 'devel' systems

This also updates OSTree to latest stable (2017.10), which is needed
for BuildStream, and updates Flatpak to latest which is needed for it to
build against the latest OSTree release.

40 files changed, 186 insertions, 12 deletions

diff --git a/gnome/strata/flatpak-common.morph b/gnome/strata/flatpak-common.morph
index fb9fae2b..47a64719 100644
--- a/gnome/strata/flatpak-common.morph
+++ b/gnome/strata/flatpak-common.morph
@@ -13,8 +13,8 @@ chunks:
 - name: flatpak
   morph: gnome/strata/flatpak-common/flatpak.morph
   repo: upstream:flatpak
-  ref: 07b342a937ed562a59aa649d793771babee57a09
-  unpetrify-ref: 0.6.8
+  ref: 52aab929fb4f261f2d7995190adfad167d76589a
+  unpetrify-ref: 0.9.10
   build-depends:
   - elfutils
   submodules:
diff --git a/strata/buildstream-tools.morph b/strata/buildstream-tools.morph
new file mode 100644
index 00000000..cb1f85a3
--- /dev/null
+++ b/strata/buildstream-tools.morph
@@ -0,0 +1,79 @@
+name: buildstream-tools
+kind: stratum
+
+description: |
+  The BuildStream build tool.
+
+build-depends:
+- morph: strata/core.morph
+- morph: strata/ostree-core.morph
+- morph: strata/python3-gobject.morph
+# Only depends on setuptools-scm and pytest-runner from this stratum
+- morph: strata/python-common.morph
+# Only depends on bubblewrap from this stratum
+- morph: strata/sandboxing.morph
+# Only depends on Git from this stratum, as a runtime dependency
+- morph: strata/devtools.morph
+
+chunks:
+- name: blessings
+  repo: upstream:python-packages/blessings
+  ref: 1a463ac86c7645315195ec012d3caf930ac3c10f
+  unpetrify-ref: '1.6'
+  build-system: python3-distutils
+
+- name: click
+  repo: upstream:python-packages/click
+  ref: df0e37dd890d36fc997986ae6d2b6c255f3ed1dc
+  unpetrify-ref: '6.7'
+  build-system: python3-distutils
+
+- name: fusepy
+  repo: upstream:python-packages/fusepy
+  ref: 8f107ade51e1f99346a584931486d8bc3fd14789
+  unpetrify-ref: v2.0.4
+  build-system: python3-distutils
+
+- name: pluginbase
+  repo: upstream:python-packages/pluginbase
+  ref: 8907716a7da2e87e16db0369ca5ec494d670cc54
+  unpetrify-ref: '0.5'
+  build-system: python3-distutils
+
+- name: psutil
+  repo: upstream:python-packages/psutil
+  ref: 8b8da39e0c62432504fb5f67c418715aad35b291
+  unpetrify-ref: master
+  build-system: python3-distutils
+
+- name: wheel
+  repo: upstream:python-packages/wheel
+  ref: 6cf95a60b3c7ae44cc1f4835b4a5153ae508d084
+  unpetrify-ref: master
+  build-system: python3-distutils
+
+- name: ruamel.base
+  morph: strata/buildstream-tools/ruamel.base.morph
+  repo: upstream:python-packages/ruamel.base
+  ref: 50ac90d1e4af4b1e6ff2472a84bacc2f45414414
+  unpetrify-ref: master
+
+- name: ruamel.std.argparse
+  morph: strata/buildstream-tools/ruamel.std.argparse.morph
+  repo: upstream:python-packages/ruamel.std.argparse
+  ref: 5d14025ccf69c3002e0aa1ab4954481584c1db6f
+  unpetrify-ref: master
+  build-depends:
+  - wheel
+
+- name: ruamel.yaml
+  repo: upstream:python-packages/ruamel.yaml
+  ref: f3de88b82bf5e3902c44f6c30aed065e56626ee6
+  unpetrify-ref: 0.10.5
+  build-system: python3-distutils
+
+- name: buildstream
+  repo: upstream:buildstream
+  ref: b27e606383339ea46a55e5cf796143c7e95b0b3a
+  unpetrify-ref: master
+  build-system: python3-distutils
diff --git a/strata/buildstream-tools/ruamel.base.morph b/strata/buildstream-tools/ruamel.base.morph
new file mode 100644
index 00000000..da833d88
--- /dev/null
+++ b/strata/buildstream-tools/ruamel.base.morph
@@ -0,0 +1,8 @@
+name: ruamel.base
+kind: chunk
+build-system: python3-distutils
+
+install-commands:
+# The setup.py is customised to helpfully tells us to use `pip install`
+# unless we disable that check with a magical extra commandline flag.
+- python3 ./setup.py install --prefix "$PREFIX" --root "$DESTDIR" --single-version-externally-managed
diff --git a/strata/buildstream-tools/ruamel.std.argparse.morph b/strata/buildstream-tools/ruamel.std.argparse.morph
new file mode 100644
index 00000000..d394a7ef
--- /dev/null
+++ b/strata/buildstream-tools/ruamel.std.argparse.morph
@@ -0,0 +1,8 @@
+name: ruamel.std.argparse
+kind: chunk
+build-system: python3-distutils
+
+install-commands:
+# The setup.py is customised to helpfully tells us to use `pip install`
+# unless we disable that check with a magical extra commandline flag.
+- python3 ./setup.py install --prefix "$PREFIX" --root "$DESTDIR" --single-version-externally-managed
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index f713ba18..4a385623 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -44,11 +44,3 @@ chunks:
   - cmdtest
   - pyfilesystem
   - pylru
-
-# This chunk isn't required to use Morph, but is required to do automated
-# migrations within the definitions.git repo.
-- name: ruamel.yaml
-  repo: upstream:python-packages/ruamel.yaml
-  ref: f3de88b82bf5e3902c44f6c30aed065e56626ee6
-  unpetrify-ref: 0.10.5
-  build-system: python-distutils
diff --git a/strata/ostree-core.morph b/strata/ostree-core.morph
index ff9725ce..3a88128f 100644
--- a/strata/ostree-core.morph
+++ b/strata/ostree-core.morph
@@ -25,8 +25,8 @@ chunks:
 - name: ostree
   morph: strata/ostree-core/ostree.morph
   repo: upstream:ostree
-  ref: c31cf75552af9be404fbc6a24643c569855c1c3b
-  unpetrify-ref: v2016.7
+  ref: 395676917b3c0dd45b4d56a3742f61b56a692c30
+  unpetrify-ref: v2017.10
   build-depends:
   - gpgme
   - libgsystem
diff --git a/strata/python-common.morph b/strata/python-common.morph
index 9777c1df..6ddf18ab 100644
--- a/strata/python-common.morph
+++ b/strata/python-common.morph
@@ -91,3 +91,15 @@ chunks:
   ref: 7e510acde274d2c806d38057f352e8525ee7ae9d
   unpetrify-ref: v5.0.4-release
   build-system: python-distutils
+- name: setuptools-scm
+  repo: upstream:python-packages/setuptools-scm
+  ref: a6f0878a67e6c2eb91ba4db1bbeb5f6c759bca00
+  unpetrify-ref: v1.15.6
+  build-system: python3-distutils
+- name: pytest-runner
+  repo: upstream:python-packages/pytest-runner
+  ref: 228cbcb5672579f21601707ba0b23169fb4f423f
+  unpetrify-ref: 2.11.1
+  build-system: python3-distutils
+  build-depends:
+  - setuptools-scm
diff --git a/strata/sandboxing.morph b/strata/sandboxing.morph
index 64de36c3..2c8eae9b 100644
--- a/strata/sandboxing.morph
+++ b/strata/sandboxing.morph
@@ -5,14 +5,25 @@ description: |
   environment.
 build-depends:
 - morph: strata/python2-core.morph
+- morph: strata/docutils.morph
 chunks:
+# Needed by YBD only.
 - name: sandboxlib
   repo: upstream:sandboxlib
   ref: ce30050daa10fa32801e8f798911b36aa82343a4
   unpetrify-ref: master
   build-system: python-distutils
+
+# Needed by Morph and YBD only.
 - name: linux-user-chroot
   repo: upstream:linux-user-chroot
   ref: 40e0b71d556414dfe150a74937f2c8a68d351d6d
   unpetrify-ref: v2015.1
   build-system: autotools
+
+# Needed by BuildStream only.
+- name: bubblewrap
+  repo: upstream:bubblewrap
+  ref: 30548332a7d04328487906edcd999c3dab67db28
+  unpetrify-ref: v0.1.8
+  build-system: autotools
diff --git a/systems/build-system-armv5l-openbmc-aspeed.morph b/systems/build-system-armv5l-openbmc-aspeed.morph
index b8799bb0..98432e02 100644
--- a/systems/build-system-armv5l-openbmc-aspeed.morph
+++ b/systems/build-system-armv5l-openbmc-aspeed.morph
@@ -39,6 +39,8 @@ strata:
   morph: strata/mtd-utilities.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/build-system-armv7l-altera-socfpga-devkit.morph b/systems/build-system-armv7l-altera-socfpga-devkit.morph
index 5d83cb6a..e5598685 100644
--- a/systems/build-system-armv7l-altera-socfpga-devkit.morph
+++ b/systems/build-system-armv7l-altera-socfpga-devkit.morph
@@ -39,6 +39,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
index 06262deb..d1fb1652 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -50,6 +50,8 @@ strata:
   morph: strata/unionfs-fuse-group.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph
index aa0deac7..c6ec46a0 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -48,6 +48,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/build-system-armv7lhf-rootfs.morph b/systems/build-system-armv7lhf-rootfs.morph
index 4c934cc9..4e4fc0b8 100644
--- a/systems/build-system-armv7lhf-rootfs.morph
+++ b/systems/build-system-armv7lhf-rootfs.morph
@@ -46,6 +46,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/build-system-armv8b64.morph b/systems/build-system-armv8b64.morph
index d544cebb..93397d6a 100644
--- a/systems/build-system-armv8b64.morph
+++ b/systems/build-system-armv8b64.morph
@@ -49,6 +49,8 @@ strata:
   morph: strata/devtools.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph
index effd0d40..d4b8c234 100644
--- a/systems/build-system-armv8l64.morph
+++ b/systems/build-system-armv8l64.morph
@@ -49,6 +49,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph
index 2a5ca04f..c67d2dc3 100644
--- a/systems/build-system-ppc64.morph
+++ b/systems/build-system-ppc64.morph
@@ -48,6 +48,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph
index 868c3213..ab13ae76 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -48,6 +48,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph
index 104d9a75..cb6a0207 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -48,6 +48,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph
index 339ecfb7..4ecec4a0 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -48,6 +48,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph
index f006df9a..8e7f545b 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -48,6 +48,8 @@ strata:
   morph: strata/ostree-core.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 78b9fd42..92eee657 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -63,6 +63,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 02f8069e..465f190a 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -66,6 +66,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 f4f37b43..6c2a0631 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -64,6 +64,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 5707e4a6..3904ce01 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -64,6 +64,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 18ca827b..dd9feae8 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -55,6 +55,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 04847e9d..0052b9d2 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -62,6 +62,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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
index f4e74723..6486aa4c 100644
--- a/systems/devel-system-armv7l-altera-socfpga-devkit.morph
+++ b/systems/devel-system-armv7l-altera-socfpga-devkit.morph
@@ -57,6 +57,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 9bcb1f50..d0ea1b0b 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -63,6 +63,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 6921c8ad..7c703093 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -69,6 +69,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 ce3dee27..2376a869 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -67,6 +67,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 2d83c2fa..0a28f15c 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -67,6 +67,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 5c5460cd..0eb2a456 100644
--- a/systems/devel-system-armv8b64.morph
+++ b/systems/devel-system-armv8b64.morph
@@ -66,6 +66,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 606ae102..93c06263 100644
--- a/systems/devel-system-armv8l64.morph
+++ b/systems/devel-system-armv8l64.morph
@@ -66,6 +66,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 34ed6834..97467640 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -61,6 +61,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 6b542186..b31ca448 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -64,6 +64,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 6b4be0ea..947c7363 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -63,6 +63,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 d17abc07..42c86b54 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -68,6 +68,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 be5ab108..cecee3f4 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -65,6 +65,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 3691b14a..3ec72443 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -72,6 +72,8 @@ strata:
   morph: strata/elixir.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.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 76d882e2..b3d57b0a 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -66,6 +66,8 @@ strata:
   morph: strata/CPAN-Mini-Inject.morph
 - name: sandboxing
   morph: strata/sandboxing.morph
+- name: buildstream-tools
+  morph: strata/buildstream-tools.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files