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.
This commit is contained in:
parent
ae463e4ef2
commit
c3e2dc71de
|
@ -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"
|
meson "$BUILDDIR" -D "sysvinit-path=$sysvinit_path" -D "rootprefix=$rootprefix" -D man=false -D "nobody-user=$nobody_user" -D "nobody-group=$nobody_group"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ninja -C "$BUILDDIR" all
|
cd "$BUILDDIR"
|
||||||
|
ninja
|
||||||
if [ "$WITH_TESTS" = 1 ] ; then
|
if [ "$WITH_TESTS" = 1 ] ; then
|
||||||
for id in 1 2 3; do
|
for id in 1 2 3; do
|
||||||
groupadd -g $id testgroup$id || :
|
groupadd -g $id testgroup$id || :
|
||||||
done
|
done
|
||||||
|
|
||||||
ninja -C "$BUILDDIR" test
|
ninja test
|
||||||
fi
|
fi
|
||||||
|
cd "$SRCDIR"
|
||||||
|
|
||||||
# Ubuntu Focal is stuck with meson 0.53.0.
|
# Ubuntu Focal is stuck with meson 0.53.0.
|
||||||
if [ "$(meson -v | cut -d . -f 2)" -gt 53 ] ; then
|
if [ "$(meson -v | cut -d . -f 2)" -gt 53 ] ; then
|
||||||
|
|
Loading…
Reference in New Issue