Update to btrfs-progs v3.18.2

acl and e2fsprogs are new dependencies of btrfs-progs.

3 files changed, 27 insertions, 2 deletions

diff --git a/strata/foundation/acl.morph b/strata/foundation/acl.morph
new file mode 100644
index 00000000..4489f5d5
--- /dev/null
+++ b/strata/foundation/acl.morph
@@ -0,0 +1,4 @@
+name: acl
+kind: chunk
+install-commands:
+- make DESTDIR="$DESTDIR" install-dev
diff --git a/strata/foundation/btrfs-progs.morph b/strata/foundation/btrfs-progs.morph
index 356c3f06..d5cb83f0 100644
--- a/strata/foundation/btrfs-progs.morph
+++ b/strata/foundation/btrfs-progs.morph
@@ -1,6 +1,6 @@
 name: btrfs-progs
 kind: chunk
 build-commands:
-- make
+- make DISABLE_DOCUMENTATION=1
 install-commands:
-- make DESTDIR="$DESTDIR" prefix="$PREFIX" install
+- make DESTDIR="$DESTDIR" prefix="$PREFIX" DISABLE_DOCUMENTATION=1 install
diff --git a/strata/foundation/e2fsprogs.morph b/strata/foundation/e2fsprogs.morph
new file mode 100644
index 00000000..a57eb15a
--- /dev/null
+++ b/strata/foundation/e2fsprogs.morph
@@ -0,0 +1,21 @@
+name: e2fsprogs
+kind: chunk
+build-system: autotools
+configure-commands:
+# Configure with the usual paths for binaries and config
+# but also disable whatever we can that is already provided by util-linux
+# Disabling e2fsprofs' libblkid does not work, but we don't have to
+# install it.
+- |
+  ./configure --prefix="$PREFIX" --sysconfdir=/etc \
+    --disable-libuuid --disable-uuidd --disable-fsck --disable-libblkid
+install-commands:
+# e2fsprogs also includes tools that are provided by util-linux, so we
+# need to selectively exclude them.  Removing them directly from DESTDIR
+# causes problems, so we need to remove them beforehand.
+- |
+  td="$(mktemp -d)"
+  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"