diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-12 11:42:13 +0000 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-12 11:42:13 +0000 |
commit | 124189b2955f30c383fc47c150ff2123568134a8 (patch) | |
tree | c8e571ae499c394881957750a4f05a4d5bf5be1a /strata/foundation | |
parent | 1319309d3ff4eb85cb0e7e6cb178cb56ff116524 (diff) | |
parent | 1b012d96c08bed47579dd79fc91177c566e7162a (diff) | |
download | definitions-124189b2955f30c383fc47c150ff2123568134a8.tar.gz |
Merge branch 'baserock/tiagogomes/armv8l64'
Reviewed by:
* Javier Jardón <jjardon@gnome.org>
* Sam Thursfield <sam.thursfield@codethink.co.uk>
Diffstat (limited to 'strata/foundation')
-rw-r--r-- | strata/foundation/acl.morph | 4 | ||||
-rw-r--r-- | strata/foundation/btrfs-progs.morph | 4 | ||||
-rw-r--r-- | strata/foundation/e2fsprogs.morph | 21 | ||||
-rw-r--r-- | strata/foundation/groff.morph | 2 | ||||
-rw-r--r-- | strata/foundation/linux-pam.morph | 2 |
5 files changed, 31 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" diff --git a/strata/foundation/groff.morph b/strata/foundation/groff.morph index fed35b7d..8380a9cc 100644 --- a/strata/foundation/groff.morph +++ b/strata/foundation/groff.morph @@ -4,6 +4,8 @@ max-jobs: 1 configure-commands: - PAGE=A4 ./configure --prefix="$PREFIX" build-commands: +# hack to avoid a netpbm dependency +- touch doc/gnu.eps - make install-commands: - make DESTDIR="$DESTDIR" install diff --git a/strata/foundation/linux-pam.morph b/strata/foundation/linux-pam.morph index 27d0a8a3..0dfbe759 100644 --- a/strata/foundation/linux-pam.morph +++ b/strata/foundation/linux-pam.morph @@ -1,6 +1,8 @@ name: linux-pam kind: chunk build-system: autotools +pre-configure-commands: +- autoreconf -ivf post-install-commands: # sudo command is expecting this file. - | |