mirror of
https://github.com/morgan9e/systemd
synced 2026-04-15 00:47:10 +09:00
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.
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -49,6 +49,8 @@
|
||||
/localectl
|
||||
/loginctl
|
||||
/machinectl
|
||||
/mkosi.builddir/
|
||||
/mkosi.cache/
|
||||
/mtd_probe
|
||||
/networkctl
|
||||
/scsi_id
|
||||
|
||||
16
mkosi.build
16
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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user