summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-12-24 09:53:53 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2024-12-25 05:52:13 +0100
commitece81f339ff41113876bf7a9a2c1ad317c2eb258 (patch)
tree912009281a6a0caa5733aee8f6ecaf6bc88e3518 /docs
parentpo: Translated using Weblate (Italian) (diff)
downloadsystemd-ece81f339ff41113876bf7a9a2c1ad317c2eb258.tar.xz
systemd-ece81f339ff41113876bf7a9a2c1ad317c2eb258.zip
docs: Use meson compile instead of ninja
"ninja -C build mkosi" doesn't actually work and fails because ninja thinks the mkosi target does not exist. "meson compile -C build mkosi" dpes work so let's use that instead. Fixes #35741
Diffstat (limited to 'docs')
-rw-r--r--docs/HACKING.md28
1 files changed, 14 insertions, 14 deletions
diff --git a/docs/HACKING.md b/docs/HACKING.md
index 6326f07916..2ac092c38b 100644
--- a/docs/HACKING.md
+++ b/docs/HACKING.md
@@ -39,17 +39,17 @@ Then, you can build and run systemd executables as follows:
```sh
$ mkosi -f sandbox meson setup build
-$ mkosi -f sandbox ninja -C build
+$ mkosi -f sandbox meson compile -C build
$ mkosi -f sandbox build/systemctl --version
```
To build and boot an OS image with the latest systemd installed:
```sh
-$ mkosi -f genkey # Generate signing keys once.
-$ mkosi -f sandbox ninja -C build mkosi # (re-)build the OS image
-$ sudo mkosi boot # Boot the image with systemd-nspawn.
-$ mkosi qemu # Boot the image with qemu.
+$ mkosi -f genkey # Generate signing keys once.
+$ mkosi -f sandbox meson compile -C build mkosi # (re-)build the OS image
+$ sudo mkosi boot # Boot the image with systemd-nspawn.
+$ mkosi qemu # Boot the image with qemu.
```
Putting this all together, here's a series of commands for preparing a patch for
@@ -60,15 +60,15 @@ $ git clone https://github.com/systemd/mkosi.git
$ ln -s $PWD/mkosi/bin/mkosi ~/.local/bin/mkosi # Make sure ~/.local/bin is in $PATH.
$ git clone https://github.com/systemd/systemd.git
$ cd systemd
-$ git checkout -b <BRANCH> # where BRANCH is the name of the branch
-$ $EDITOR src/core/main.c # or wherever you'd like to make your changes
-$ mkosi -f sandbox meson setup build # Set up meson
-$ mkosi -f genkey # Generate signing keys once.
-$ mkosi -f sandbox ninja -C build mkosi # (re-)build the test image
-$ mkosi qemu # Boot the image in qemu
-$ git add -p # interactively put together your patch
-$ git commit # commit it
-$ git push -u <REMOTE> # where REMOTE is your "fork" on GitHub
+$ git checkout -b <BRANCH> # where BRANCH is the name of the branch
+$ $EDITOR src/core/main.c # or wherever you'd like to make your changes
+$ mkosi -f sandbox meson setup build # Set up meson
+$ mkosi -f genkey # Generate signing keys once.
+$ mkosi -f sandbox meson compile -C build mkosi # (re-)build the test image
+$ mkosi qemu # Boot the image in qemu
+$ git add -p # interactively put together your patch
+$ git commit # commit it
+$ git push -u <REMOTE> # where REMOTE is your "fork" on GitHub
```
And after that, head over to your repo on GitHub and click "Compare & pull