Add morph-utils to cross-boostrap

4 files changed, 6 insertions, 59 deletions

diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph
index 9687ac7e..90c1ed4a 100644
--- a/strata/cross-bootstrap.morph
+++ b/strata/cross-bootstrap.morph
@@ -4,11 +4,6 @@ description: The minimal development tools to build a baserock devel system
 build-depends:
 - morph: strata/core.morph
 chunks:
-- name: six
-  repo: upstream:six
-  ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: groff
   morph: strata/cross-bootstrap/groff.morph
   repo: upstream:groff
@@ -22,65 +17,11 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - groff
-- name: python-ttystatus
-  morph: strata/cross-bootstrap/python-ttystatus.morph
-  repo: upstream:python-ttystatus
-  ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: python-coveragepy
-  morph: strata/cross-bootstrap/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/cross-bootstrap/cmdtest.morph
-  repo: upstream:cmdtest
-  ref: ac91791842c6e7e6eda3213916af413255999c7b
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - cliapp
-  - python-ttystatus
-  - python-markdown
 - name: linux-user-chroot
   repo: upstream:linux-user-chroot
   ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: pyfilesystem
-  morph: strata/cross-bootstrap/pyfilesystem.morph
-  repo: upstream:pyfilesystem
-  ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - six
-- name: morph
-  repo: baserock:baserock/morph
-  ref: 67afd098cd297b769b1341a460d160a2902ba4e4
-  unpetrify-ref: master
-  build-depends:
-  - cliapp
-  - cmdtest
-  - python-coverage-test-runner
-  - pyfilesystem
 - name: rsync
   morph: strata/cross-bootstrap/rsync.morph
   repo: upstream:rsync
diff --git a/systems/cross-bootstrap-system-armv7lhf-generic.morph b/systems/cross-bootstrap-system-armv7lhf-generic.morph
index 4eecf7fe..23817c0c 100644
--- a/systems/cross-bootstrap-system-armv7lhf-generic.morph
+++ b/systems/cross-bootstrap-system-armv7lhf-generic.morph
@@ -7,5 +7,7 @@ strata:
   morph: strata/build-essential.morph
 - name: core
   morph: strata/core.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: cross-bootstrap
   morph: strata/cross-bootstrap.morph
diff --git a/systems/cross-bootstrap-system-ppc64-generic.morph b/systems/cross-bootstrap-system-ppc64-generic.morph
index 8b274e80..40c80c00 100644
--- a/systems/cross-bootstrap-system-ppc64-generic.morph
+++ b/systems/cross-bootstrap-system-ppc64-generic.morph
@@ -7,5 +7,7 @@ strata:
   morph: strata/build-essential.morph
 - name: core
   morph: strata/core.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: cross-bootstrap
   morph: strata/cross-bootstrap.morph
diff --git a/systems/cross-bootstrap-system-x86_64-generic.morph b/systems/cross-bootstrap-system-x86_64-generic.morph
index bdd42cf3..646a04d3 100644
--- a/systems/cross-bootstrap-system-x86_64-generic.morph
+++ b/systems/cross-bootstrap-system-x86_64-generic.morph
@@ -7,5 +7,7 @@ strata:
   morph: strata/build-essential.morph
 - name: core
   morph: strata/core.morph
+- name: morph-utils
+  morph: strata/morph-utils.morph
 - name: cross-bootstrap
   morph: strata/cross-bootstrap.morph