Merge pull request #7504 from keszybz/two-mkosi-ideas

Two mkosi tweaks
This commit is contained in:
Lennart Poettering
2017-11-29 16:24:14 +01:00
committed by GitHub
2 changed files with 2 additions and 1 deletions
+1
View File
@@ -29,5 +29,6 @@
/image.raw.cache-pre-inst
/install-tree
/mkosi.builddir/
/mkosi.output/
/tags
__pycache__/
+1 -1
View File
@@ -28,7 +28,7 @@ export LC_CTYPE=en_US.UTF-8
sysvinit_path=`realpath /etc/init.d`
[ -f "$BUILDDIR"/build.ninja ] || meson "$BUILDDIR" -D "sysvinit-path=$sysvinit_path" -D "default-hierarchy=unified"
[ -f "$BUILDDIR"/build.ninja ] || meson "$BUILDDIR" -D "sysvinit-path=$sysvinit_path" -D default-hierarchy=unified -D man=false
ninja -C "$BUILDDIR" all
[ "$WITH_TESTS" = 0 ] || ninja -C "$BUILDDIR" test || ( RET="$?" ; cat "$BUILDDIR"/meson-logs/testlog.txt ; exit "$RET" )
ninja -C "$BUILDDIR" install