diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-07-12 19:58:53 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-07-17 18:56:12 +0200 |
| commit | 70e760e3a73bf7b39fceb6a4c3ed09d055b591b5 (patch) | |
| tree | 06b0e7975ea5dd5a1f4c0cfed2a673d3b8ee373b | |
| parent | gitignore: include mkosi -i files in gitignore (diff) | |
| download | systemd-70e760e3a73bf7b39fceb6a4c3ed09d055b591b5.tar.xz systemd-70e760e3a73bf7b39fceb6a4c3ed09d055b591b5.zip | |
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.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | mkosi.build | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index cd289d6538..aa20b80602 100644 --- 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 2231118da5..a36460c6f5 100755 --- 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) |