diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-16 18:03:02 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-16 18:03:02 +0100 |
| commit | 9727091d1d127d375287a1c8d5d33413691db511 (patch) | |
| tree | 3c2b26061cf5721fdd7cb0181ef6bf9a3ed5b9f4 | |
| parent | ce5cbbc7d0bb5d68c8e32c37678aa8b3092c8ce8 (diff) | |
| parent | 977244b445658941189d9fbbfc718b80dc210df6 (diff) | |
| download | definitions-9727091d1d127d375287a1c8d5d33413691db511.tar.gz | |
Merge branch 'baserock/sam/update-e2fsprogs'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
| -rw-r--r-- | strata/tools.morph | 4 | ||||
| -rw-r--r-- | strata/tools/e2fsprogs.morph | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/strata/tools.morph b/strata/tools.morph index 590d75d5..6ee70fdb 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -62,8 +62,8 @@ chunks: - name: e2fsprogs morph: strata/tools/e2fsprogs.morph repo: upstream:e2fsprogs - ref: 485edc675200ff3097cec521c357441a1c2d9b0d - unpetrify-ref: baserock/morph + ref: 6a3741ad293031447b95b88431eafa77401a8987 + unpetrify-ref: v1.42.12 build-depends: [] - name: file repo: upstream:file 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 |