summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2021-01-09 17:32:00 +0100
committerDaan De Meyer <daan.j.demeyer@gmail.com>2021-01-09 18:05:57 +0100
commitc3e2dc71dee3175e0443e388555ee2f2d9e8311b (patch)
tree49b4a6cff8f1c8758eca82960ff7fbf3a76d3957
parentae463e4ef2c8c3ba18abc58315ac0daea8407c03 (diff)
downloadsystemd-c3e2dc71dee3175e0443e388555ee2f2d9e8311b.tar.gz
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.
-rwxr-xr-xmkosi.build6
1 files changed, 4 insertions, 2 deletions
diff --git a/mkosi.build b/mkosi.build
index 5da5207fb5..0e90480c6d 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