summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-16 10:03:27 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-16 10:08:30 +0100
commitb406e5a77c33ca76c46e143e591dbd55eaa65d17 (patch)
tree3a2dd5994d61e17731139dc0ca52d0e1322a0794
parent0a8fa2da3197a43a220e8d68a3287a66f90b2104 (diff)
downloaddefinitions-b406e5a77c33ca76c46e143e591dbd55eaa65d17.tar.gz
Copy e2fsprogs morphology from chunk repo baserock/morph branch
When the organise-morphologies.py script pulled this in it to definitions.git it must have lost the comments. It's good to keep them there.
-rw-r--r--strata/tools/e2fsprogs.morph7
1 files changed, 7 insertions, 0 deletions
diff --git a/strata/tools/e2fsprogs.morph b/strata/tools/e2fsprogs.morph
index 9d3b32a8..801f8abe 100644
--- a/strata/tools/e2fsprogs.morph
+++ b/strata/tools/e2fsprogs.morph
@@ -2,10 +2,17 @@ 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
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