Update all references between morphologies to be filenames

When the chunk morphologies are moved into definitions, morphologies
will be referred to by their filename rather than by the morphology
name. This allows us to simplify morph edit, as well as be specific when
referring to chunks from strata, meaning that the directory structure
does not affect the functionality of morph.

1 files changed, 153 insertions, 153 deletions

diff --git a/build-essential/morph b/build-essential/morph
index c6e7ba2c..1ff9d0a6 100644
--- a/build-essential/morph
+++ b/build-essential/morph
@@ -1,4 +1,4 @@
-name: build-essential
+name: build-essential/morph
 kind: stratum
 description: |
   Toolchain stratum
@@ -32,287 +32,287 @@ description: |
   /tools/bin during stage 2 but in stage 3 it becomes a real directory
   again.
 chunks:
-- name: stage1-binutils
+- name: build-essential/stage1-binutils.morph
   repo: upstream:binutils-redhat
   ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
   unpetrify-ref: baserock/build-essential
   build-depends: []
   build-mode: bootstrap
   prefix: /tools
-- name: stage1-gcc
+- name: build-essential/stage1-gcc.morph
   repo: upstream:gcc-tarball
   ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage1-binutils
+  - build-essential/stage1-binutils.morph
   build-mode: bootstrap
   prefix: /tools
-- name: stage2-linux-api-headers
+- name: build-essential/stage2-linux-api-headers.morph
   repo: upstream:linux
   ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage1-binutils
-  - stage1-gcc
+  - build-essential/stage1-binutils.morph
+  - build-essential/stage1-gcc.morph
   build-mode: bootstrap
   prefix: /tools
-- name: stage2-eglibc
+- name: build-essential/stage2-eglibc.morph
   repo: upstream:eglibc2
   ref: 43ee5d250ad47d2bee8ec17954efb7f22d2b804c
   unpetrify-ref: baserock/2.15-build-essential
   build-depends:
-  - stage1-binutils
-  - stage1-gcc
-  - stage2-linux-api-headers
+  - build-essential/stage1-binutils.morph
+  - build-essential/stage1-gcc.morph
+  - build-essential/stage2-linux-api-headers.morph
   build-mode: bootstrap
   prefix: /tools
-- name: stage2-binutils
+- name: build-essential/stage2-binutils.morph
   repo: upstream:binutils-redhat
   ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage1-binutils
-  - stage1-gcc
-  - stage2-eglibc
+  - build-essential/stage1-binutils.morph
+  - build-essential/stage1-gcc.morph
+  - build-essential/stage2-eglibc.morph
   build-mode: bootstrap
   prefix: /tools
-- name: stage2-gcc-fixed-headers
+- name: build-essential/stage2-gcc-fixed-headers.morph
   repo: upstream:gcc-tarball
   ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage1-binutils
-  - stage1-gcc
-  - stage2-eglibc
+  - build-essential/stage1-binutils.morph
+  - build-essential/stage1-gcc.morph
+  - build-essential/stage2-eglibc.morph
   build-mode: bootstrap
   prefix: /tools
-- name: stage2-gcc
+- name: build-essential/stage2-gcc.morph
   repo: upstream:gcc-tarball
   ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage1-binutils
-  - stage1-gcc
-  - stage2-eglibc
-  - stage2-gcc-fixed-headers
+  - build-essential/stage1-binutils.morph
+  - build-essential/stage1-gcc.morph
+  - build-essential/stage2-eglibc.morph
+  - build-essential/stage2-gcc-fixed-headers.morph
   build-mode: bootstrap
   prefix: /tools
-- name: stage2-busybox
+- name: build-essential/stage2-busybox.morph
   repo: upstream:busybox
   ref: eeb9014f28e3aa00673a0fad127e7420da4392db
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage1-binutils
-  - stage1-gcc
-  - stage2-eglibc
+  - build-essential/stage1-binutils.morph
+  - build-essential/stage1-gcc.morph
+  - build-essential/stage2-eglibc.morph
   build-mode: bootstrap
   prefix: /tools
-- name: stage2-fhs-dirs
+- name: build-essential/stage2-fhs-dirs.morph
   repo: baserock:baserock/fhs-dirs
   ref: 442e2a6453ec380bf9d64f6be50e57d54ddf93d3
   unpetrify-ref: master
   build-depends: []
   build-mode: bootstrap
   prefix: /tools
-- name: stage2-gawk
+- name: build-essential/stage2-gawk.morph
   repo: upstream:gawk
   ref: 6a0eb04c3d2ac24d80d505b42a8f67799487d133
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage1-binutils
-  - stage1-gcc
-  - stage2-eglibc
+  - build-essential/stage1-binutils.morph
+  - build-essential/stage1-gcc.morph
+  - build-essential/stage2-eglibc.morph
   build-mode: bootstrap
   prefix: /tools
-- name: stage2-make
+- name: build-essential/stage2-make.morph
   repo: upstream:make
   ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage1-binutils
-  - stage1-gcc
-  - stage2-eglibc
+  - build-essential/stage1-binutils.morph
+  - build-essential/stage1-gcc.morph
+  - build-essential/stage2-eglibc.morph
   build-mode: bootstrap
   prefix: /tools
-- name: stage2-reset-specs
+- name: build-essential/stage2-reset-specs.morph
   repo: upstream:eglibc2
   ref: 43ee5d250ad47d2bee8ec17954efb7f22d2b804c
   unpetrify-ref: baserock/2.15-build-essential
   build-depends:
-  - stage1-binutils
-  - stage1-gcc
-  - stage2-linux-api-headers
-  - stage2-eglibc
+  - build-essential/stage1-binutils.morph
+  - build-essential/stage1-gcc.morph
+  - build-essential/stage2-linux-api-headers.morph
+  - build-essential/stage2-eglibc.morph
   build-mode: bootstrap
   prefix: /tools
-- name: fhs-dirs
+- name: build-essential/fhs-dirs.morph
   repo: baserock:baserock/fhs-dirs
   ref: 442e2a6453ec380bf9d64f6be50e57d54ddf93d3
   unpetrify-ref: master
   build-depends:
-  - stage2-binutils
-  - stage2-busybox
-  - stage2-eglibc
-  - stage2-fhs-dirs
-  - stage2-gawk
-  - stage2-gcc
-  - stage2-linux-api-headers
-  - stage2-make
-  - stage2-reset-specs
+  - build-essential/stage2-binutils.morph
+  - build-essential/stage2-busybox.morph
+  - build-essential/stage2-eglibc.morph
+  - build-essential/stage2-fhs-dirs.morph
+  - build-essential/stage2-gawk.morph
+  - build-essential/stage2-gcc.morph
+  - build-essential/stage2-linux-api-headers.morph
+  - build-essential/stage2-make.morph
+  - build-essential/stage2-reset-specs.morph
   build-mode: staging
   prefix: /usr
-- name: linux-api-headers
+- name: build-essential/linux-api-headers.morph
   repo: upstream:linux
   ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage2-binutils
-  - stage2-busybox
-  - stage2-eglibc
-  - stage2-fhs-dirs
-  - stage2-gawk
-  - stage2-gcc
-  - stage2-linux-api-headers
-  - stage2-make
-  - stage2-reset-specs
+  - build-essential/stage2-binutils.morph
+  - build-essential/stage2-busybox.morph
+  - build-essential/stage2-eglibc.morph
+  - build-essential/stage2-fhs-dirs.morph
+  - build-essential/stage2-gawk.morph
+  - build-essential/stage2-gcc.morph
+  - build-essential/stage2-linux-api-headers.morph
+  - build-essential/stage2-make.morph
+  - build-essential/stage2-reset-specs.morph
   build-mode: staging
   prefix: /usr
-- name: eglibc
+- name: build-essential/eglibc.morph
   repo: upstream:eglibc2
   ref: 43ee5d250ad47d2bee8ec17954efb7f22d2b804c
   unpetrify-ref: baserock/2.15-build-essential
   build-depends:
-  - stage2-binutils
-  - stage2-busybox
-  - stage2-eglibc
-  - stage2-fhs-dirs
-  - stage2-gawk
-  - stage2-gcc
-  - stage2-linux-api-headers
-  - stage2-make
-  - stage2-reset-specs
-  - linux-api-headers
+  - build-essential/stage2-binutils.morph
+  - build-essential/stage2-busybox.morph
+  - build-essential/stage2-eglibc.morph
+  - build-essential/stage2-fhs-dirs.morph
+  - build-essential/stage2-gawk.morph
+  - build-essential/stage2-gcc.morph
+  - build-essential/stage2-linux-api-headers.morph
+  - build-essential/stage2-make.morph
+  - build-essential/stage2-reset-specs.morph
+  - build-essential/linux-api-headers.morph
   build-mode: staging
   prefix: /usr
-- name: zlib
+- name: build-essential/zlib.morph
   repo: upstream:zlib
   ref: db3aed6856d7a23186844fdf93105cad2fcf2f2f
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage2-binutils
-  - stage2-busybox
-  - stage2-eglibc
-  - stage2-fhs-dirs
-  - stage2-gawk
-  - stage2-gcc
-  - stage2-linux-api-headers
-  - stage2-make
-  - stage2-reset-specs
-  - eglibc
+  - build-essential/stage2-binutils.morph
+  - build-essential/stage2-busybox.morph
+  - build-essential/stage2-eglibc.morph
+  - build-essential/stage2-fhs-dirs.morph
+  - build-essential/stage2-gawk.morph
+  - build-essential/stage2-gcc.morph
+  - build-essential/stage2-linux-api-headers.morph
+  - build-essential/stage2-make.morph
+  - build-essential/stage2-reset-specs.morph
+  - build-essential/eglibc.morph
   build-mode: staging
   prefix: /usr
-- name: binutils
+- name: build-essential/binutils.morph
   repo: upstream:binutils-redhat
   ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage2-binutils
-  - stage2-busybox
-  - stage2-eglibc
-  - stage2-fhs-dirs
-  - stage2-gawk
-  - stage2-gcc
-  - stage2-linux-api-headers
-  - stage2-make
-  - stage2-reset-specs
-  - eglibc
-  - zlib
+  - build-essential/stage2-binutils.morph
+  - build-essential/stage2-busybox.morph
+  - build-essential/stage2-eglibc.morph
+  - build-essential/stage2-fhs-dirs.morph
+  - build-essential/stage2-gawk.morph
+  - build-essential/stage2-gcc.morph
+  - build-essential/stage2-linux-api-headers.morph
+  - build-essential/stage2-make.morph
+  - build-essential/stage2-reset-specs.morph
+  - build-essential/eglibc.morph
+  - build-essential/zlib.morph
   build-mode: staging
   prefix: /usr
-- name: busybox
+- name: build-essential/busybox.morph
   repo: upstream:busybox
   ref: eeb9014f28e3aa00673a0fad127e7420da4392db
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage2-binutils
-  - stage2-busybox
-  - stage2-eglibc
-  - stage2-fhs-dirs
-  - stage2-gawk
-  - stage2-gcc
-  - stage2-linux-api-headers
-  - stage2-make
-  - stage2-reset-specs
-  - eglibc
+  - build-essential/stage2-binutils.morph
+  - build-essential/stage2-busybox.morph
+  - build-essential/stage2-eglibc.morph
+  - build-essential/stage2-fhs-dirs.morph
+  - build-essential/stage2-gawk.morph
+  - build-essential/stage2-gcc.morph
+  - build-essential/stage2-linux-api-headers.morph
+  - build-essential/stage2-make.morph
+  - build-essential/stage2-reset-specs.morph
+  - build-essential/eglibc.morph
   build-mode: staging
   prefix: /usr
-- name: gawk
+- name: build-essential/gawk.morph
   repo: upstream:gawk
   ref: 6a0eb04c3d2ac24d80d505b42a8f67799487d133
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage2-binutils
-  - stage2-busybox
-  - stage2-eglibc
-  - stage2-fhs-dirs
-  - stage2-gawk
-  - stage2-gcc
-  - stage2-linux-api-headers
-  - stage2-make
-  - stage2-reset-specs
-  - eglibc
+  - build-essential/stage2-binutils.morph
+  - build-essential/stage2-busybox.morph
+  - build-essential/stage2-eglibc.morph
+  - build-essential/stage2-fhs-dirs.morph
+  - build-essential/stage2-gawk.morph
+  - build-essential/stage2-gcc.morph
+  - build-essential/stage2-linux-api-headers.morph
+  - build-essential/stage2-make.morph
+  - build-essential/stage2-reset-specs.morph
+  - build-essential/eglibc.morph
   build-mode: staging
   prefix: /usr
-- name: gcc
+- name: build-essential/gcc.morph
   repo: upstream:gcc-tarball
   ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage2-binutils
-  - stage2-busybox
-  - stage2-eglibc
-  - stage2-fhs-dirs
-  - stage2-gawk
-  - stage2-gcc
-  - stage2-linux-api-headers
-  - stage2-make
-  - stage2-reset-specs
-  - eglibc
-  - zlib
+  - build-essential/stage2-binutils.morph
+  - build-essential/stage2-busybox.morph
+  - build-essential/stage2-eglibc.morph
+  - build-essential/stage2-fhs-dirs.morph
+  - build-essential/stage2-gawk.morph
+  - build-essential/stage2-gcc.morph
+  - build-essential/stage2-linux-api-headers.morph
+  - build-essential/stage2-make.morph
+  - build-essential/stage2-reset-specs.morph
+  - build-essential/eglibc.morph
+  - build-essential/zlib.morph
   build-mode: staging
   prefix: /usr
-- name: make
+- name: build-essential/make.morph
   repo: upstream:make
   ref: 56968f58301e6e5157cf4c8b6deefbaff2955eba
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage2-binutils
-  - stage2-busybox
-  - stage2-eglibc
-  - stage2-fhs-dirs
-  - stage2-gawk
-  - stage2-gcc
-  - stage2-linux-api-headers
-  - stage2-make
-  - stage2-reset-specs
-  - eglibc
+  - build-essential/stage2-binutils.morph
+  - build-essential/stage2-busybox.morph
+  - build-essential/stage2-eglibc.morph
+  - build-essential/stage2-fhs-dirs.morph
+  - build-essential/stage2-gawk.morph
+  - build-essential/stage2-gcc.morph
+  - build-essential/stage2-linux-api-headers.morph
+  - build-essential/stage2-make.morph
+  - build-essential/stage2-reset-specs.morph
+  - build-essential/eglibc.morph
   build-mode: staging
   prefix: /usr
-- name: ccache
+- name: build-essential/ccache.morph
   repo: upstream:ccache
   ref: 567631456f0899cdf0c382f898d38aadc8901d32
   unpetrify-ref: baserock/build-essential
   build-depends:
-  - stage2-binutils
-  - stage2-busybox
-  - stage2-eglibc
-  - stage2-fhs-dirs
-  - stage2-gawk
-  - stage2-gcc
-  - stage2-linux-api-headers
-  - stage2-make
-  - stage2-reset-specs
-  - eglibc
-  - zlib
+  - build-essential/stage2-binutils.morph
+  - build-essential/stage2-busybox.morph
+  - build-essential/stage2-eglibc.morph
+  - build-essential/stage2-fhs-dirs.morph
+  - build-essential/stage2-gawk.morph
+  - build-essential/stage2-gcc.morph
+  - build-essential/stage2-linux-api-headers.morph
+  - build-essential/stage2-make.morph
+  - build-essential/stage2-reset-specs.morph
+  - build-essential/eglibc.morph
+  - build-essential/zlib.morph
   build-mode: staging
   prefix: /usr