From fe2b7631ad20b0e518b9f566608ff5f9b84d4d8b Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 6 Dec 2020 16:45:45 +0000 Subject: [PATCH] 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. --- mkosi.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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