summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-10-02 14:16:00 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-10-02 14:21:54 (GMT)
commit1a7fbedf56a4c7a6afb683851dde5d34bbb48b86 (patch)
tree9a5b81307418a19ed4ab92f2569af5141a466cbb
parent6d4a0ec6caa5a1f1f1a73a7a8bd061889cf06299 (diff)
downloaddefinitions-baserock/richardmaw/distbuild-fix.tar.gz
Split morph out of toolsbaserock/richardmaw/distbuild-fix
morph now contains distbuild and morph-cache-server, so the distbuild stratum can go away, and anything that needs it can now use morph.
-rw-r--r--strata/distbuild.morph23
-rw-r--r--strata/morph-utils.morph82
-rw-r--r--strata/morph-utils/cmdtest.morph (renamed from strata/tools/cmdtest.morph)0
-rw-r--r--strata/morph-utils/pyfilesystem.morph (renamed from strata/tools/pyfilesystem.morph)0
-rw-r--r--strata/morph-utils/python-coveragepy.morph (renamed from strata/tools/python-coveragepy.morph)0
-rw-r--r--strata/morph-utils/python-ttystatus.morph (renamed from strata/tools/python-ttystatus.morph)0
-rw-r--r--strata/tools.morph65
-rw-r--r--strata/trove.morph16
-rw-r--r--systems/devel-system-armv7-chroot.morph2
-rw-r--r--systems/devel-system-armv7-highbank.morph2
-rw-r--r--systems/devel-system-armv7-versatile.morph2
-rw-r--r--systems/devel-system-armv7-wandboard.morph2
-rw-r--r--systems/devel-system-armv7b-chroot.morph2
-rw-r--r--systems/devel-system-armv7b-highbank.morph2
-rw-r--r--systems/devel-system-armv7lhf-chroot.morph2
-rw-r--r--systems/devel-system-armv7lhf-highbank.morph2
-rw-r--r--systems/devel-system-armv7lhf-jetson.morph2
-rw-r--r--systems/devel-system-armv7lhf-wandboard.morph2
-rw-r--r--systems/devel-system-ppc64-chroot.morph2
-rw-r--r--systems/devel-system-ppc64-generic.morph2
-rw-r--r--systems/devel-system-x86_32-chroot.morph2
-rw-r--r--systems/devel-system-x86_32-generic.morph2
-rw-r--r--systems/devel-system-x86_64-chroot.morph2
-rw-r--r--systems/devel-system-x86_64-generic.morph2
-rw-r--r--systems/devel-system-x86_64-vagrant.morph2
-rw-r--r--systems/distbuild-system-armv7lhf-highbank.morph4
-rw-r--r--systems/distbuild-system-armv7lhf-jetson.morph4
-rw-r--r--systems/distbuild-system-ppc64.morph4
-rw-r--r--systems/distbuild-system-x86_32.morph4
-rw-r--r--systems/distbuild-system-x86_64.morph4
-rw-r--r--systems/trove-system-x86_64.morph2
-rw-r--r--systems/xfce-system.morph2
32 files changed, 131 insertions, 113 deletions
diff --git a/strata/distbuild.morph b/strata/distbuild.morph
deleted file mode 100644
index 36306d9..0000000
--- a/strata/distbuild.morph
+++ /dev/null
@@ -1,23 +0,0 @@
-name: distbuild
-kind: stratum
-description: Morph distributed build software
-build-depends:
-- morph: strata/foundation.morph
-- morph: strata/core.morph
-- morph: strata/tools.morph
-chunks:
-- name: bottle
- repo: upstream:bottle
- ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: morph-cache-server
- repo: baserock:baserock/morph-cache-server
- ref: cc5f95fa563c4817cdcffc428da18e263bd02ae2
- unpetrify-ref: master
- build-depends: []
-- name: flup
- repo: upstream:flup
- ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70
- unpetrify-ref: baserock/morph
- build-depends: []
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
new file mode 100644
index 0000000..d7389a6
--- /dev/null
+++ b/strata/morph-utils.morph
@@ -0,0 +1,82 @@
+name: morph-utils
+kind: stratum
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: python-ttystatus
+ morph: strata/morph-utils/python-ttystatus.morph
+ repo: upstream:python-ttystatus
+ ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: python-markdown
+ repo: upstream:python-markdown
+ ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: git-fat
+ morph: strata/tools/git-fat.morph
+ repo: upstream:git-fat
+ ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: six
+ repo: upstream:six
+ ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: pyfilesystem
+ morph: strata/morph-utils/pyfilesystem.morph
+ repo: upstream:pyfilesystem
+ ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - six
+- name: python-coveragepy
+ morph: strata/morph-utils/python-coveragepy.morph
+ repo: upstream:python-coveragepy
+ ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: python-coverage-test-runner
+ repo: upstream:python-coverage-test-runner
+ ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-coveragepy
+- name: cliapp
+ repo: upstream:cliapp
+ ref: cec20cedd062a3aef1b04f997e77b45090c07806
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-coverage-test-runner
+- name: cmdtest
+ morph: strata/morph-utils/cmdtest.morph
+ repo: upstream:cmdtest
+ ref: 62fa7e08f76a5b6bb8410add49c40656b3e73acd
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - cliapp
+ - python-ttystatus
+ - python-markdown
+- name: bottle
+ repo: upstream:bottle
+ ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: flup
+ repo: upstream:flup
+ ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: morph
+ repo: baserock:baserock/morph
+ ref: b98cfd4e0673cee64e61abee714f12dd220c8a2e
+ unpetrify-ref: master
+ build-depends:
+ - cliapp
+ - cmdtest
+ - python-coverage-test-runner
+ - pyfilesystem
+ - bottle
+ - flup
diff --git a/strata/tools/cmdtest.morph b/strata/morph-utils/cmdtest.morph
index 3e1c71c..3e1c71c 100644
--- a/strata/tools/cmdtest.morph
+++ b/strata/morph-utils/cmdtest.morph
diff --git a/strata/tools/pyfilesystem.morph b/strata/morph-utils/pyfilesystem.morph
index a4931df..a4931df 100644
--- a/strata/tools/pyfilesystem.morph
+++ b/strata/morph-utils/pyfilesystem.morph
diff --git a/strata/tools/python-coveragepy.morph b/strata/morph-utils/python-coveragepy.morph
index ed5e3d8..ed5e3d8 100644
--- a/strata/tools/python-coveragepy.morph
+++ b/strata/morph-utils/python-coveragepy.morph
diff --git a/strata/tools/python-ttystatus.morph b/strata/morph-utils/python-ttystatus.morph
index e45ef7a..e45ef7a 100644
--- a/strata/tools/python-ttystatus.morph
+++ b/strata/morph-utils/python-ttystatus.morph
diff --git a/strata/tools.morph b/strata/tools.morph
index bddd980..333b173 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -4,49 +4,6 @@ description: Extra development tools included in the devel system
build-depends:
- morph: strata/foundation.morph
chunks:
-- name: six
- repo: upstream:six
- ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-ttystatus
- morph: strata/tools/python-ttystatus.morph
- repo: upstream:python-ttystatus
- ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-coveragepy
- morph: strata/tools/python-coveragepy.morph
- repo: upstream:python-coveragepy
- ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-coverage-test-runner
- repo: upstream:python-coverage-test-runner
- ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7
- unpetrify-ref: baserock/morph
- build-depends:
- - python-coveragepy
-- name: cliapp
- repo: upstream:cliapp
- ref: cec20cedd062a3aef1b04f997e77b45090c07806
- unpetrify-ref: baserock/morph
- build-depends:
- - python-coverage-test-runner
-- name: python-markdown
- repo: upstream:python-markdown
- ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: cmdtest
- morph: strata/tools/cmdtest.morph
- repo: upstream:cmdtest
- ref: 62fa7e08f76a5b6bb8410add49c40656b3e73acd
- unpetrify-ref: baserock/morph
- build-depends:
- - cliapp
- - python-ttystatus
- - python-markdown
- name: coreutils
morph: strata/tools/coreutils.morph
repo: upstream:coreutils
@@ -91,28 +48,6 @@ chunks:
ref: fffb8558208586338587027c265fd0eca44466be
unpetrify-ref: baserock/morph
build-depends: []
-- name: pyfilesystem
- morph: strata/tools/pyfilesystem.morph
- repo: upstream:pyfilesystem
- ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6
- unpetrify-ref: baserock/morph
- build-depends:
- - six
-- name: morph
- repo: baserock:baserock/morph
- ref: 963dca9868938241740d63ec1475c5f887513e0c
- unpetrify-ref: master
- build-depends:
- - cliapp
- - cmdtest
- - python-coverage-test-runner
- - pyfilesystem
-- name: git-fat
- morph: strata/tools/git-fat.morph
- repo: upstream:git-fat
- ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610
- unpetrify-ref: baserock/morph
- build-depends: []
- name: pv
repo: upstream:pv
ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a
diff --git a/strata/trove.morph b/strata/trove.morph
index f69dd02..634e5bf 100644
--- a/strata/trove.morph
+++ b/strata/trove.morph
@@ -3,17 +3,8 @@ kind: stratum
description: Trove software
build-depends:
- morph: strata/tools.morph
+- morph: strata/morph-utils.morph
chunks:
-- name: bottle
- repo: upstream:bottle
- ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: morph-cache-server
- repo: baserock:baserock/morph-cache-server
- ref: acefe33868585cf31cda53474a3004da42e00896
- unpetrify-ref: master
- build-depends: []
- name: lua
morph: strata/trove/lua.morph
repo: upstream:lua
@@ -214,11 +205,6 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- pcre
-- name: flup
- repo: upstream:flup
- ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70
- unpetrify-ref: baserock/morph
- build-depends: []
- name: lua-scrypt
morph: strata/trove/lua-scrypt.morph
repo: upstream:lua-scrypt
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index fd1cf5f..b063673 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -12,6 +12,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
configuration-extensions:
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index 112a8af..3e86b73 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -14,6 +14,8 @@ strata:
morph: strata/bsp-armv7-highbank.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
configuration-extensions:
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index efa48ec..43f7a11 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -14,6 +14,8 @@ strata:
morph: strata/bsp-armv7-versatile.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
configuration-extensions:
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 49d189d..11bccaf 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -13,6 +13,8 @@ strata:
morph: strata/bsp-wandboard.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
configuration-extensions:
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 4ee0686..5081bd2 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -11,6 +11,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
configuration-extensions:
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index 686b97f..9054135 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -14,6 +14,8 @@ strata:
morph: strata/bsp-armv7b-highbank.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
configuration-extensions:
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 4505331..090d4e6 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -11,6 +11,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
configuration-extensions:
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index ed2d41d..bb5c01b 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -14,6 +14,8 @@ strata:
morph: strata/bsp-armv7-highbank.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
configuration-extensions:
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index 74a1cc2..ffcf176 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -12,6 +12,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
- name: bsp-jetson-devel
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index 00ef200..8f15033 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -13,6 +13,8 @@ strata:
morph: strata/bsp-wandboard.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
configuration-extensions:
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index a2430af..344aa81 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -12,6 +12,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
configuration-extensions:
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index 259e224..7ccff38 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -14,6 +14,8 @@ strata:
morph: strata/bsp-ppc64-generic.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
configuration-extensions:
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index a708573..dc88422 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -12,6 +12,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
- name: bsp-x86_both-tools
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index a7f3f9c..d9264ac 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -14,6 +14,8 @@ strata:
morph: strata/bsp-x86_32-generic.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
- name: cloudinit-support
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 91f80db..34ccf31 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -12,6 +12,8 @@ strata:
morph: strata/foundation.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
- name: bsp-x86_both-tools
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index bf5a7f4..6413305 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -14,6 +14,8 @@ strata:
morph: strata/bsp-x86_64-generic.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: openstack-clients
morph: strata/openstack-clients.morph
- name: cloudinit-support
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index 29acb5b..43f68e7 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -33,6 +33,8 @@ strata:
morph: strata/genivi-x-generic.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: virtualization
morph: strata/virtualization.morph
- name: openstack-clients
diff --git a/systems/distbuild-system-armv7lhf-highbank.morph b/systems/distbuild-system-armv7lhf-highbank.morph
index 112883b..7d0caf8 100644
--- a/systems/distbuild-system-armv7lhf-highbank.morph
+++ b/systems/distbuild-system-armv7lhf-highbank.morph
@@ -13,10 +13,10 @@ strata:
morph: strata/bsp-armv7-highbank.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: nfs
morph: strata/nfs.morph
-- name: distbuild
- morph: strata/distbuild.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/distbuild-system-armv7lhf-jetson.morph b/systems/distbuild-system-armv7lhf-jetson.morph
index 8423264..8c9348b 100644
--- a/systems/distbuild-system-armv7lhf-jetson.morph
+++ b/systems/distbuild-system-armv7lhf-jetson.morph
@@ -13,10 +13,10 @@ strata:
morph: strata/bsp-jetson-devel.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: nfs
morph: strata/nfs.morph
-- name: distbuild
- morph: strata/distbuild.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/distbuild-system-ppc64.morph b/systems/distbuild-system-ppc64.morph
index e8c5704..f7fae96 100644
--- a/systems/distbuild-system-ppc64.morph
+++ b/systems/distbuild-system-ppc64.morph
@@ -13,10 +13,10 @@ strata:
morph: strata/bsp-ppc64-generic.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: nfs
morph: strata/nfs.morph
-- name: distbuild
- morph: strata/distbuild.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/distbuild-system-x86_32.morph b/systems/distbuild-system-x86_32.morph
index f207867..25c01ab 100644
--- a/systems/distbuild-system-x86_32.morph
+++ b/systems/distbuild-system-x86_32.morph
@@ -13,10 +13,10 @@ strata:
morph: strata/bsp-x86_32-generic.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: nfs
morph: strata/nfs.morph
-- name: distbuild
- morph: strata/distbuild.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/distbuild-system-x86_64.morph b/systems/distbuild-system-x86_64.morph
index b248d9d..c42cb55 100644
--- a/systems/distbuild-system-x86_64.morph
+++ b/systems/distbuild-system-x86_64.morph
@@ -13,10 +13,10 @@ strata:
morph: strata/bsp-x86_64-generic.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: nfs
morph: strata/nfs.morph
-- name: distbuild
- morph: strata/distbuild.morph
- name: ansible
morph: strata/ansible.morph
- name: cloudinit-support
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index fbcdf3f..297c9fb 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -13,6 +13,8 @@ strata:
morph: strata/core.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: trove
morph: strata/trove.morph
- name: nfs
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
index 17531e8..0c53d7c 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -33,6 +33,8 @@ strata:
morph: strata/gtk2.morph
- name: tools
morph: strata/tools.morph
+- name: morph-utils
+ morph: strata/morph-utils.morph
- name: xfce
morph: strata/xfce.morph
configuration-extensions: