summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-27 11:13:02 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-27 11:13:02 (GMT)
commit4a007e07625b2edd184ba8e4856c2a9db371d68d (patch)
tree4ff94f134c2c48c81ebc26400455c2106a0266db
parent620e6dc62b7b29d300fa94e65a8a953dae609d2d (diff)
parent4dd66bf443a273bdeb9e283e42823539599826a2 (diff)
downloaddefinitions-4a007e07625b2edd184ba8e4856c2a9db371d68d.tar.gz
Merge remote-tracking branch 'write/baserock/sam/add-ext4-progs'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
-rw-r--r--strata/foundation/e2fsprogs.morph5
1 files changed, 3 insertions, 2 deletions
diff --git a/strata/foundation/e2fsprogs.morph b/strata/foundation/e2fsprogs.morph
index a57eb15..55ac486 100644
--- a/strata/foundation/e2fsprogs.morph
+++ b/strata/foundation/e2fsprogs.morph
@@ -8,14 +8,15 @@ configure-commands:
# install it.
- |
./configure --prefix="$PREFIX" --sysconfdir=/etc \
- --disable-libuuid --disable-uuidd --disable-fsck --disable-libblkid
+ --disable-libuuid --disable-uuidd --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
make DESTDIR="$td" install-libs
- find "$td" \( -name blkid -o -name findfs -o -name fsck \) -delete
+ find "$td" \( -name blkid -o -name findfs -o \) -delete
find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete
mv "$td"/* "$DESTDIR"