mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 00:14:32 +09:00
Merge pull request #33857 from DaanDeMeyer/mkosi
Two small improvements
This commit is contained in:
2
.github/workflows/mkosi.yml
vendored
2
.github/workflows/mkosi.yml
vendored
@@ -159,8 +159,6 @@ jobs:
|
||||
|
||||
[Host]
|
||||
QemuMem=4G
|
||||
# We build with debuginfo so there's no point in mounting the sources into the machine.
|
||||
RuntimeBuildSources=no
|
||||
EOF
|
||||
|
||||
- name: Generate secure boot key
|
||||
|
||||
@@ -63,21 +63,10 @@ ToolsTree=default
|
||||
```
|
||||
|
||||
Every time you rerun the `mkosi` command a fresh image is built, incorporating
|
||||
all current changes you made to the project tree. To avoid having to build a new
|
||||
image all the time when iterating on a patch, add the following to
|
||||
`mkosi.local.conf`:
|
||||
|
||||
```conf
|
||||
[Host]
|
||||
RuntimeBuildSources=yes
|
||||
```
|
||||
|
||||
After enabling this setting, the source and build directories will be mounted to
|
||||
`/work/src` and `/work/build` respectively when booting the image as a container
|
||||
or virtual machine. To build the latest changes and re-install after booting the
|
||||
image, run one of the following commands in another terminal on your host (
|
||||
choose the right one depending on the distribution of the container or virtual
|
||||
machine):
|
||||
all current changes you made to the project tree. To build the latest changes
|
||||
and re-install after booting the image, run one of the following commands in
|
||||
another terminal on your host (choose the right one depending on the
|
||||
distribution of the container or virtual machine):
|
||||
|
||||
```sh
|
||||
mkosi -t none && mkosi ssh dnf upgrade --disablerepo="*" "/work/build/*.rpm" # CentOS/Fedora
|
||||
|
||||
@@ -154,6 +154,7 @@ def main():
|
||||
),
|
||||
]),
|
||||
'--credential', f"journal.storage={'persistent' if sys.stderr.isatty() else args.storage}",
|
||||
*(['--runtime-build-sources=no'] if not sys.stderr.isatty() else []),
|
||||
'qemu' if args.vm or os.getuid() != 0 else 'boot',
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user