23 files changed, 3 insertions, 26 deletions
diff --git a/strata/build-essential/binutils.morph b/strata/build-essential/binutils.def
index bab52672..c332c84a 100644
--- a/strata/build-essential/binutils.morph
+++ b/strata/build-essential/binutils.def
@@ -1,5 +1,4 @@
 name: binutils
-kind: chunk
 build-system: autotools
 
 configure-commands:
diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.def
index b0bb46f5..265e5e31 100644
--- a/strata/build-essential/busybox.morph
+++ b/strata/build-essential/busybox.def
@@ -1,5 +1,4 @@
 name: busybox
-kind: chunk
 
 configure-commands:
 # Busybox's default config has everything enabled.
diff --git a/strata/build-essential/ccache.morph b/strata/build-essential/ccache.def
index 383eee8a..f2d5bc0d 100644
--- a/strata/build-essential/ccache.morph
+++ b/strata/build-essential/ccache.def
@@ -1,5 +1,4 @@
 name: ccache
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX"
diff --git a/strata/build-essential/fhs-dirs.morph b/strata/build-essential/fhs-dirs.def
index 64474872..9f5a0a88 100644
--- a/strata/build-essential/fhs-dirs.morph
+++ b/strata/build-essential/fhs-dirs.def
@@ -1,5 +1,4 @@
 name: fhs-dirs
-kind: chunk
 description: create the FHS 2.3 directory hierarchy and the usual files
 install-commands:
 - sh ./create-fhs-dirs "$DESTDIR"
diff --git a/strata/build-essential/gawk.morph b/strata/build-essential/gawk.def
index 1ad871c6..f21c81d3 100644
--- a/strata/build-essential/gawk.morph
+++ b/strata/build-essential/gawk.def
@@ -1,5 +1,4 @@
 name: gawk
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/build-essential/gcc.morph b/strata/build-essential/gcc.def
index 50e2918c..592a39b7 100644
--- a/strata/build-essential/gcc.morph
+++ b/strata/build-essential/gcc.def
@@ -1,5 +1,4 @@
 name: gcc
-kind: chunk
 
 configure-commands:
 - mkdir o
diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.def
index 789283eb..949e6d5e 100644
--- a/strata/build-essential/glibc.morph
+++ b/strata/build-essential/glibc.def
@@ -1,5 +1,4 @@
 name: glibc
-kind: chunk
 products:
 - artifact: glibc-nss
   include:
diff --git a/strata/build-essential/linux-api-headers.morph b/strata/build-essential/linux-api-headers.def
index e1ff2638..a852e6b4 100644
--- a/strata/build-essential/linux-api-headers.morph
+++ b/strata/build-essential/linux-api-headers.def
@@ -1,5 +1,4 @@
 name: linux-api-headers
-kind: chunk
 install-commands:
 - ARCH=$(./morph-arch) make INSTALL_HDR_PATH=dest headers_install
 - install -d "$DESTDIR${PREFIX-/usr}/include"
diff --git a/strata/build-essential/make.morph b/strata/build-essential/make.def
index 1259b342..fdb98974 100644
--- a/strata/build-essential/make.morph
+++ b/strata/build-essential/make.def
@@ -1,5 +1,4 @@
 name: make
-kind: chunk
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/build-essential/stage1-binutils.morph b/strata/build-essential/stage1-binutils.def
index b6670d5c..55417a9a 100644
--- a/strata/build-essential/stage1-binutils.morph
+++ b/strata/build-essential/stage1-binutils.def
@@ -1,5 +1,4 @@
 name: stage1-binutils
-kind: chunk
 build-system: autotools
 
 configure-commands:
diff --git a/strata/build-essential/stage1-gcc.morph b/strata/build-essential/stage1-gcc.def
index 0cb03568..63a61b81 100644
--- a/strata/build-essential/stage1-gcc.morph
+++ b/strata/build-essential/stage1-gcc.def
@@ -1,11 +1,10 @@
 name: stage1-gcc
-kind: chunk
 
 configure-commands:
 - mkdir o
 
 # Configure flag notes:
-#  1. Standard flags. See gcc.morph.
+#  1. Standard flags. See gcc.
 #  2. Disable searching /usr/local/include for headers
 #  3. The pass 1 compiler needs to find the libraries we build in pass 2.
 #     Include path must be set explicility, because it defaults to
diff --git a/strata/build-essential/stage2-binutils.morph b/strata/build-essential/stage2-binutils.def
index bc0b18ac..56f5056d 100644
--- a/strata/build-essential/stage2-binutils.morph
+++ b/strata/build-essential/stage2-binutils.def
@@ -1,5 +1,4 @@
 name: stage2-binutils
-kind: chunk
 build-system: autotools
 
 configure-commands:
diff --git a/strata/build-essential/stage2-busybox.morph b/strata/build-essential/stage2-busybox.def
index dc23d09b..da5e0a40 100644
--- a/strata/build-essential/stage2-busybox.morph
+++ b/strata/build-essential/stage2-busybox.def
@@ -1,5 +1,4 @@
 name: stage2-busybox
-kind: chunk
 
 configure-commands:
 # Explicitly setting HOSTCC is required because we have a 'gcc' earlier in
diff --git a/strata/build-essential/stage2-fake-bash.morph b/strata/build-essential/stage2-fake-bash.def
index 021fd366..7deb793b 100644
--- a/strata/build-essential/stage2-fake-bash.morph
+++ b/strata/build-essential/stage2-fake-bash.def
@@ -1,4 +1,3 @@
 name: stage2-fake-bash
-kind: chunk
 install-commands:
 - printf '#!/bin/sh\nexec /bin/sh "$@"\n' | install -D /proc/self/fd/0 -m 755 "$DESTDIR$PREFIX/bin/bash"
diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.def
index 14a6e253..23f08826 100644
--- a/strata/build-essential/stage2-fhs-dirs.morph
+++ b/strata/build-essential/stage2-fhs-dirs.def
@@ -1,5 +1,4 @@
 name: stage2-fhs-dirs
-kind: chunk
 description: create the FHS 2.3 directory hierarchy and the usual files
 install-commands:
 - sh ./create-fhs-dirs "$DESTDIR"
diff --git a/strata/build-essential/stage2-gawk.morph b/strata/build-essential/stage2-gawk.def
index f644d72b..5e21b421 100644
--- a/strata/build-essential/stage2-gawk.morph
+++ b/strata/build-essential/stage2-gawk.def
@@ -1,5 +1,4 @@
 name: stage2-gawk
-kind: chunk
 build-system: autotools
 configure-commands:
 - STAGE2_SYSROOT="$(dirname $(pwd))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
diff --git a/strata/build-essential/stage2-gcc-fixed-headers.morph b/strata/build-essential/stage2-gcc-fixed-headers.def
index 10794872..1c9e70e1 100644
--- a/strata/build-essential/stage2-gcc-fixed-headers.morph
+++ b/strata/build-essential/stage2-gcc-fixed-headers.def
@@ -1,5 +1,4 @@
 name: stage2-gcc-fixed-headers
-kind: chunk
 install-commands:
 # Stage 1 GCC's fixincludes process created a limits.h before there was
 # a real limits.h available for the target. This step (taken from Linux
diff --git a/strata/build-essential/stage2-gcc.morph b/strata/build-essential/stage2-gcc.def
index bf6378c1..5c9b729a 100644
--- a/strata/build-essential/stage2-gcc.morph
+++ b/strata/build-essential/stage2-gcc.def
@@ -1,5 +1,4 @@
 name: stage2-gcc
-kind: chunk
 
 configure-commands:
 - mkdir o
@@ -19,7 +18,7 @@ configure-commands:
 #  3. This flag causes the correct --sysroot flag to be passed when calling
 #     stage 1 GCC.
 #  4. C++ is built in stage 3.
-#  5. Standard flags. See gcc.morph.
+#  5. Standard flags. See gcc.
 - |
   export STAGE2_SYSROOT="$(dirname $(pwd))"
   export CC="$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT"
diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.def
index ffa0970b..5ba67410 100644
--- a/strata/build-essential/stage2-glibc.morph
+++ b/strata/build-essential/stage2-glibc.def
@@ -1,5 +1,4 @@
 name: stage2-glibc
-kind: chunk
 
 configure-commands:
 - mkdir o
@@ -7,7 +6,7 @@ configure-commands:
 # Configure flag notes:
 #   1. Avoid installing to PREFIX/lib64 on x86_64.
 #   2. Location of linux-api-headers.
-#   3. Normal flags. See glibc.morph.
+#   3. Normal flags. See glibc.
 #   4. Force configuration values of certain things that can't be detected
 #      in a cross-compile.
 - |
diff --git a/strata/build-essential/stage2-linux-api-headers.morph b/strata/build-essential/stage2-linux-api-headers.def
index 5cbf2f05..0742c930 100644
--- a/strata/build-essential/stage2-linux-api-headers.morph
+++ b/strata/build-essential/stage2-linux-api-headers.def
@@ -1,5 +1,4 @@
 name: stage2-linux-api-headers
-kind: chunk
 install-commands:
 - |
   export ARCH=$(./morph-arch)
diff --git a/strata/build-essential/stage2-make.morph b/strata/build-essential/stage2-make.def
index d3c8bf22..4eaf86ae 100644
--- a/strata/build-essential/stage2-make.morph
+++ b/strata/build-essential/stage2-make.def
@@ -1,5 +1,4 @@
 name: stage2-make
-kind: chunk
 build-system: autotools
 configure-commands:
 - STAGE2_SYSROOT="$(dirname $(pwd))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
diff --git a/strata/build-essential/stage2-reset-specs.morph b/strata/build-essential/stage2-reset-specs.def
index 8892f67c..ab933f60 100644
--- a/strata/build-essential/stage2-reset-specs.morph
+++ b/strata/build-essential/stage2-reset-specs.def
@@ -1,5 +1,4 @@
 name: stage2-reset-specs
-kind: chunk
 
 # Nasty hack to get around being unable to reliably add configuration to gcc,
 # hence the gcc specs are modified, combined with Baserock's rootfs protection
diff --git a/strata/build-essential/zlib.morph b/strata/build-essential/zlib.def
index a69eebf3..730688b1 100644
--- a/strata/build-essential/zlib.morph
+++ b/strata/build-essential/zlib.def
@@ -1,5 +1,4 @@
 name: zlib
-kind: chunk
 max-jobs: 1
 configure-commands:
 - ./configure --prefix="$PREFIX"