Merge pull request #18182 from DaanDeMeyer/mkosi-build-pushd

mkosi.build: Silence "Entering directory" message from ninja
This commit is contained in:
Daan De Meyer 2021-01-09 17:27:56 +00:00 committed by GitHub
commit 534fd13070
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions

View File

@ -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 || : getent group $id > /dev/null || 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