From 4dd66bf443a273bdeb9e283e42823539599826a2 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 24 Feb 2015 18:01:44 +0000 Subject: Install e2fsprogs binaries such as mkfs.ext* and fsck.ext* Commit 57ce68fea03e8985888ab2a875f5efbc79d7b07a changed the install command from `make install` to `make install-libs`. Since then systems have been missing mkfs.ext4 and other important tools. Also, don't disable fsck.ext*. No other component provides these programs, and they are needed to check for disk errors on 'ext' formatted disks. --- strata/foundation/e2fsprogs.morph | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/strata/foundation/e2fsprogs.morph b/strata/foundation/e2fsprogs.morph index a57eb15a..55ac486c 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" -- cgit v1.2.1