mkosi: make use of BUILDDIR if it is set

This way, the new "mkosi.builddir" support proposed in PR:

https://github.com/systemd/mkosi/pull/114

will be made use of automatically.

diff --git a/.gitignore b/.gitignore
index cd289d65380b115bbb2bfea69dba931f9d6950ef..aa20b8060220f63c320926222bcfd4e6685d7fbe 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,8 @@
 /localectl
 /loginctl
 /machinectl
+/mkosi.builddir/
+/mkosi.cache/
 /mtd_probe
 /networkctl
 /scsi_id

diff --git a/mkosi.build b/mkosi.build
index 2231118da5f489b80a0de59ef58c7b226b70db6a..a36460c6f5aec3d288430b8967201e686a0b2472 100755 (executable)
--- a/mkosi.build
+++ b/mkosi.build
@@ -20,15 +20,19 @@
 # This is a build script for OS image generation using mkosi (https://github.com/systemd/mkosi).
 # Simply invoke "mkosi" in the project directory to build an OS image.
 
+# If mkosi.builddir/ exists mkosi will set $BUILDDIR to it, let's then use it
+# as out-of-tree build dir. Otherwise, let's make up our own builddir.
+[ -z "$BUILDDIR" ] && BUILDDIR=build
+
 export LC_CTYPE=C.UTF-8
-meson build
-ninja -C build all
-ninja -C build test
-ninja -C build install
+test -f "$BUILDDIR"/build.ninja || meson "$BUILDDIR"
+ninja -C "$BUILDDIR" all
+ninja -C "$BUILDDIR" test
+ninja -C "$BUILDDIR" install
 
-mkdir -p $DESTDIR/etc
+mkdir -p "$DESTDIR"/etc
 
-cat > $DESTDIR/etc/issue <<EOF
+cat > "$DESTDIR"/etc/issue <<EOF
 \S (built from systemd tree)
 Kernel \r on an \m (\l)