4 files changed, 17 insertions, 8 deletions
diff --git a/strata/tools/distcc.morph b/strata/tools/distcc.morph
index 6c910f86..9f42b50e 100644
--- a/strata/tools/distcc.morph
+++ b/strata/tools/distcc.morph
@@ -1,9 +1,6 @@
 name: distcc
 kind: chunk
 build-system: autotools
-pre-configure-commands:
-- NOCONFIGURE=1 ./autogen.sh
-- cp /usr/share/automake*/config.guess .
-- cp /usr/share/automake*/config.sub .
 configure-commands:
+- NOCONFIGURE=1 ./autogen.sh
 - ./configure --prefix="$PREFIX" --disable-Werror
diff --git a/strata/tools/e2fsprogs.morph b/strata/tools/e2fsprogs.morph
new file mode 100644
index 00000000..db1ea4cc
--- /dev/null
+++ b/strata/tools/e2fsprogs.morph
@@ -0,0 +1,15 @@
+name: e2fsprogs
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+  ./configure --prefix="$PREFIX" --sysconfdir=/etc \
+    --disable-libuuid --disable-uuidd --disable-fsck
+install-commands:
+- |
+  td="$(mktemp -d)"
+  make DESTDIR="$td" install
+  make DESTDIR="$td" install-libs
+  find "$td" \( -name blkid -o -name findfs -o -name fsck \) -delete
+  find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete
+  mv "$td"/* "$DESTDIR"
diff --git a/strata/tools/gdb.morph b/strata/tools/gdb.morph
index 6f60da9e..8b82b9d9 100644
--- a/strata/tools/gdb.morph
+++ b/strata/tools/gdb.morph
@@ -2,5 +2,4 @@ name: gdb
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./configure --prefix="$PREFIX" --disable-werror --disable-gas --disable-binutils
-  --disable-ld --disable-gold --disable-gprof
+- ./configure --prefix="$PREFIX" --disable-werror
diff --git a/strata/tools/vala-bootstrap.morph b/strata/tools/vala-bootstrap.morph
index e55b1887..c09299f6 100644
--- a/strata/tools/vala-bootstrap.morph
+++ b/strata/tools/vala-bootstrap.morph
@@ -1,7 +1,5 @@
 name: vala-bootstrap
 kind: chunk
 build-system: autotools
-pre-configure-commands:
-- autoreconf -ivf
 configure-commands:
 - ./configure --prefix="$PREFIX"