1 files changed, 117 insertions, 25 deletions
diff --git a/systems/build-system-armv5l-openbmc-aspeed.morph b/systems/build-system-armv5l-openbmc-aspeed.morph
index b8799bb0..2f55d04d 100644
--- a/systems/build-system-armv5l-openbmc-aspeed.morph
+++ b/systems/build-system-armv5l-openbmc-aspeed.morph
@@ -1,49 +1,141 @@
 name: build-system-armv5l-openbmc-aspeed
-kind: system
+kind: assemblage
 description: |
   The system that should be used for building other Baserock systems
   for little endian ARMv5 computers.
-arch: armv5l
-strata:
+configuration-extensions:
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
+- extensions/hosts
+contents:
 - name: build-essential
   morph: strata/build-essential.morph
+  build-depends: []
 - name: core
   morph: strata/core.morph
-- name: foundation
-  morph: strata/foundation.morph
+  build-depends:
+  - build-essential
 - name: python2-core
   morph: strata/python2-core.morph
+  build-depends:
+  - build-essential
+  - core
 - name: bsp-armv5l-openbmc-aspeed
   morph: strata/bsp-armv5l-openbmc-aspeed.morph
+  build-depends:
+  - build-essential
+  - core
 - name: tools
   morph: strata/tools.morph
+  build-depends:
+  - build-essential
+  - core
+- name: pcre-utils
+  morph: strata/pcre-utils.morph
+  build-depends:
+  - build-essential
+  - core
+- include-mode: build-time
+  build-depends:
+  - build-essential
+  - core
+  name: coreutils-common
+  morph: strata/coreutils-common.morph
+- name: foundation
+  morph: strata/foundation.morph
+  build-depends:
+  - build-essential
+  - core
+  - coreutils-common
 - name: python-cliapp
   morph: strata/python-cliapp.morph
-- name: python-pygobject
-  morph: strata/python-pygobject.morph
+  build-depends:
+  - build-essential
+  - core
+  - python2-core
 - name: python-wsgi
   morph: strata/python-wsgi.morph
-- name: morph-utils
-  morph: strata/morph-utils.morph
+  build-depends:
+  - build-essential
+  - core
+  - python2-core
+- name: sandboxing
+  morph: strata/sandboxing.morph
+  build-depends:
+  - build-essential
+  - core
+  - python2-core
+- include-mode: build-time
+  build-depends:
+  - build-essential
+  - core
+  - python2-core
+  name: docutils
+  morph: strata/docutils.morph
 - name: devtools
   morph: strata/devtools.morph
-- name: libsoup-common
-  morph: strata/libsoup-common.morph
+  build-depends:
+  - build-essential
+  - core
+  - docutils
+  - python2-core
 - name: glib-common
   morph: strata/glib-common.morph
-- name: pcre-utils
-  morph: strata/pcre-utils.morph
-- name: ostree-core
-  morph: strata/ostree-core.morph
+  build-depends:
+  - build-essential
+  - core
+  - pcre-utils
+  - python2-core
 - name: mtd-utilities
   morph: strata/mtd-utilities.morph
-- name: sandboxing
-  morph: strata/sandboxing.morph
-configuration-extensions:
-- extensions/set-hostname
-- extensions/add-config-files
-- extensions/nfsboot
-- extensions/install-files
-- extensions/fstab
-- extensions/install-essential-files
-- extensions/hosts
+  build-depends:
+  - build-essential
+  - core
+  - coreutils-common
+  - foundation
+- name: python-pygobject
+  morph: strata/python-pygobject.morph
+  build-depends:
+  - build-essential
+  - core
+  - glib-common
+  - pcre-utils
+  - python2-core
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+  build-depends:
+  - build-essential
+  - core
+  - glib-common
+  - pcre-utils
+  - python2-core
+- name: ostree-core
+  morph: strata/ostree-core.morph
+  build-depends:
+  - build-essential
+  - core
+  - coreutils-common
+  - foundation
+  - glib-common
+  - libsoup-common
+  - pcre-utils
+  - python2-core
+- name: morph-utils
+  morph: strata/morph-utils.morph
+  build-depends:
+  - build-essential
+  - core
+  - coreutils-common
+  - foundation
+  - glib-common
+  - libsoup-common
+  - ostree-core
+  - pcre-utils
+  - python-cliapp
+  - python-pygobject
+  - python-wsgi
+  - python2-core