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.

7 files changed, 120 insertions, 10 deletions

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