summaryrefslogtreecommitdiffstats
path: root/docs/HACKING.md
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2023-11-28 18:38:22 +0100
committerDaan De Meyer <daan.j.demeyer@gmail.com>2023-11-28 19:54:58 +0100
commitbcb335ac681fa8f5e88b9b62493f5c901ac7a008 (patch)
tree1d5ebbe78013ff30b2a0cff940f20bdead74b6f4 /docs/HACKING.md
parentboot: suffix SecureBoot message with newline (diff)
downloadsystemd-bcb335ac681fa8f5e88b9b62493f5c901ac7a008.tar.xz
systemd-bcb335ac681fa8f5e88b9b62493f5c901ac7a008.zip
Update to mkosi v19
- Use mkosi.images/ instead of mkosi.presets/ - Use the .chroot suffix to run scripts in the image - Use BuildSources= match for the kernel build - Move 10-systemd.conf to mkosi.conf and rely on mkosi.local.conf for local configuration
Diffstat (limited to 'docs/HACKING.md')
-rw-r--r--docs/HACKING.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/HACKING.md b/docs/HACKING.md
index 0178a43dba..c0892169a9 100644
--- a/docs/HACKING.md
+++ b/docs/HACKING.md
@@ -35,7 +35,7 @@ possible, however. In order to simplify testing for cases like this we provide
a set of `mkosi` build files directly in the source tree.
[mkosi](https://github.com/systemd/mkosi) is a tool for building clean OS images
from an upstream distribution in combination with a fresh build of the project
-in the local working directory. To make use of this, please install `mkosi` v18
+in the local working directory. To make use of this, please install `mkosi` v19
or newer using your distribution's package manager or from the
[GitHub repository](https://github.com/systemd/mkosi). `mkosi` will build an
image for the host distro by default. First, run `mkosi genkey` to generate a key
@@ -60,8 +60,8 @@ Putting this all together, here's a series of commands for preparing a patch
for systemd:
```sh
-$ git clone https://github.com/systemd/mkosi.git # If mkosi v18 or newer is not packaged by your distribution
-$ ln -s $PWD/mkosi/bin/mkosi /usr/local/bin/mkosi # If mkosi v18 or newer is not packaged by your distribution
+$ git clone https://github.com/systemd/mkosi.git # If mkosi v19 or newer is not packaged by your distribution
+$ ln -s $PWD/mkosi/bin/mkosi /usr/local/bin/mkosi # If mkosi v19 or newer is not packaged by your distribution
$ git clone https://github.com/systemd/systemd.git
$ cd systemd
$ git checkout -b <BRANCH> # where BRANCH is the name of the branch
@@ -234,7 +234,7 @@ QEMU.
To allow VSCode's debugger to attach to systemd running in a mkosi image, we have to make sure it can access
the virtual machine spawned by mkosi where systemd is running. mkosi makes this possible via a handy SSH
option that makes the generated image accessible via SSH when booted. Thus you must build the image with
-`mkosi --ssh`. The easiest way to set the option is to create a file `mkosi.conf` in the root of the
+`mkosi --ssh`. The easiest way to set the option is to create a file `mkosi.local.conf` in the root of the
repository and add the following contents:
```
@@ -343,7 +343,7 @@ To debug systemd-boot in an IDE such as VSCode we can use a launch configuration
If you're hacking on the kernel in tandem with systemd, you can clone a kernel repository in mkosi.kernel/ in
the systemd repository, and mkosi will automatically build that kernel and install it into the final image.
To prevent the distribution's kernel from being installed (which isn't necessary since we're building our
-own kernel), you can add the following snippets to mkosi.conf.d/20-local.conf:
+own kernel), you can add the following snippets to `mkosi.local.conf`:
(This snippet is for Fedora, the list of packages will need to be changed for other distributions)