From 578ee05155c0f6d8cc07f785fcc636037545c8da Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 29 Jul 2024 13:40:42 +0200 Subject: [PATCH 1/2] test: Don't mount build sources into image when running non-interactively --- .github/workflows/mkosi.yml | 2 -- test/integration-test-wrapper.py | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 7070e9c636..124dc6fcc4 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -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 diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py index d7a622abe8..596761aa89 100755 --- a/test/integration-test-wrapper.py +++ b/test/integration-test-wrapper.py @@ -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', ] From ecfdecfd6a0f8ee6001fb1360a6fcf942cfc554b Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 29 Jul 2024 13:42:28 +0200 Subject: [PATCH 2/2] docs: Simplify hacking instructions a bit We enable RuntimeBuildSources=yes by default so let's drop it from the documentation. --- docs/HACKING.md | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/docs/HACKING.md b/docs/HACKING.md index 2e964f4178..b17875f62c 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -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