From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 9 Jan 2021 16:32:00 +0000 (+0100)
Subject: mkosi.build: Silence "Entering directory" message from ninja
X-Git-Tag: v248-rc1~388^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3e2dc71dee3175e0443e388555ee2f2d9e8311b;p=thirdparty%2Fsystemd.git

mkosi.build: Silence "Entering directory" message from ninja

When using `ninja -C "$BUILDDIR"`, ninja prints an annoying log
message about entering the directory that cannot be silenced. Let's
manually move in and out of the build directory instead.
---

diff --git a/mkosi.build b/mkosi.build
index 5da5207fb5e..0e90480c6dc 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -87,14 +87,16 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then
         meson "$BUILDDIR" -D "sysvinit-path=$sysvinit_path" -D "rootprefix=$rootprefix" -D man=false -D "nobody-user=$nobody_user" -D "nobody-group=$nobody_group"
 fi
 
-ninja -C "$BUILDDIR" all
+cd "$BUILDDIR"
+ninja
 if [ "$WITH_TESTS" = 1 ] ; then
         for id in 1 2 3; do
                 groupadd -g $id testgroup$id || :
         done
 
-        ninja -C "$BUILDDIR" test
+        ninja test
 fi
+cd "$SRCDIR"
 
 # Ubuntu Focal is stuck with meson 0.53.0.
 if [ "$(meson -v | cut -d . -f 2)" -gt 53 ] ; then