1 files changed, 63 insertions, 16 deletions
diff --git a/systems/cxmanage-system-x86_64-generic.morph b/systems/cxmanage-system-x86_64-generic.morph
index 4929f04f..e19b6261 100644
--- a/systems/cxmanage-system-x86_64-generic.morph
+++ b/systems/cxmanage-system-x86_64-generic.morph
@@ -1,28 +1,75 @@
 name: cxmanage-system-x86_64-generic
-kind: system
+kind: assemblage
 description: A baserock development system with calxeda management tools added
-arch: x86_64
-strata:
+configuration-extensions:
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/fstab
+- extensions/install-essential-files
+contents:
 - name: build-essential
   morph: strata/build-essential.morph
+  build-depends: []
 - name: core
   morph: strata/core.morph
-- name: foundation
-  morph: strata/foundation.morph
-- name: bsp-x86_64-generic
-  morph: strata/bsp-x86_64-generic.morph
+  build-depends:
+  - build-essential
 - name: tools
   morph: strata/tools.morph
-- name: glib-common
-  morph: strata/glib-common.morph
+  build-depends:
+  - build-essential
+  - core
+- name: coreutils-common
+  morph: strata/coreutils-common.morph
+  include-mode: build-time
+  build-depends:
+  - build-essential
+  - core
+- name: python2-core
+  morph: strata/python2-core.morph
+  include-mode: build-time
+  build-depends:
+  - build-essential
+  - core
+- name: foundation
+  morph: strata/foundation.morph
+  build-depends:
+  - build-essential
+  - core
+  - coreutils-common
 - name: pcre-utils
   morph: strata/pcre-utils.morph
+  build-depends:
+  - build-essential
+  - core
+  - tools
 - name: cxmanage
   morph: strata/cxmanage.morph
-configuration-extensions:
-- extensions/set-hostname
-- extensions/add-config-files
-- extensions/nfsboot
-- extensions/install-files
-- extensions/fstab
-- extensions/install-essential-files
+  build-depends:
+  - build-essential
+  - core
+  - tools
+- name: docutils
+  morph: strata/docutils.morph
+  include-mode: build-time
+  build-depends:
+  - build-essential
+  - core
+  - python2-core
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+  build-depends:
+  - build-essential
+  - core
+  - docutils
+  - python2-core
+- name: glib-common
+  morph: strata/glib-common.morph
+  build-depends:
+  - build-essential
+  - core
+  - pcre-utils
+  - python2-core
+  - tools