summaryrefslogtreecommitdiff
path: root/mkosi.build
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2020-12-06 16:45:45 +0000
committerDaan De Meyer <daan.j.demeyer@gmail.com>2020-12-06 22:11:11 +0000
commitfe2b7631ad20b0e518b9f566608ff5f9b84d4d8b (patch)
treede571a33b67944c83f08d2f0c74a206b3644989e /mkosi.build
parent1394a3ec351048bae008627a0775d1f9a6c46294 (diff)
downloadsystemd-fe2b7631ad20b0e518b9f566608ff5f9b84d4d8b.tar.gz
mkosi: Add --quiet and --no-rebuild options to meson install in mkosi.build
By default, meson install prints a line for every file it installs. This is verbose and doesn't provide much value. Let's silence the meson install step to remove this output from the mkosi build step. The --no-rebuild option removes some additional duplicate output by the meson install step. Ubuntu Focal still has meson 0.53.0 so we add a version check and only use the new feature if the meson version supports it.
Diffstat (limited to 'mkosi.build')
-rwxr-xr-xmkosi.build8
1 files changed, 7 insertions, 1 deletions
diff --git a/mkosi.build b/mkosi.build
index eb24798526..c16cd3c33b 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -95,7 +95,13 @@ if [ "$WITH_TESTS" = 1 ] ; then
ninja -C "$BUILDDIR" test
fi
-meson install -C "$BUILDDIR"
+
+# Ubuntu Focal is stuck with meson 0.53.0.
+if [ "$(meson -v | cut -d . -f 2)" -gt 53 ] ; then
+ meson install -C "$BUILDDIR" --quiet --no-rebuild
+else
+ meson install -C "$BUILDDIR" --no-rebuild
+fi
mkdir -p "$DESTDIR"/etc