From 0298ddb881672de7c208a073b1ac69d99c2d2612 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 3 Apr 2025 16:37:56 +0200 Subject: [PATCH 1/2] docs: Make sure we run mkosi genkey before everything else Otherwise other commands might fail saying the keys don't exist yet. --- docs/HACKING.md | 4 ++-- test/integration-tests/standalone/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/HACKING.md b/docs/HACKING.md index c076aa303b..85adca5974 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -39,6 +39,7 @@ chance that your distribution's packaged version of mkosi will be too old. Then, you can build, run and test systemd executables as follows: ```sh +$ mkosi -f genkey # Generate signing keys once. $ mkosi -f sandbox -- meson setup -Dbpf-framework=disabled build # bpftool detection inside mkosi sandbox is broken on Ubuntu Noble and older $ mkosi -f sandbox -- meson compile -C build $ mkosi -f sandbox -- build/systemctl --version @@ -48,7 +49,6 @@ $ mkosi -f sandbox -- meson test -C build # Run the unit tests To build and boot an OS image with the latest systemd installed: ```sh -$ mkosi -f genkey # Generate signing keys once. $ mkosi -f sandbox -- meson compile -C build mkosi # (re-)build the OS image $ mkosi boot # Boot the image with systemd-nspawn. $ mkosi vm # Boot the image with qemu. @@ -64,8 +64,8 @@ $ git clone https://github.com/systemd/systemd.git $ cd systemd $ git checkout -b # 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 setup build # Set up meson $ mkosi -f sandbox -- meson compile -C build mkosi # (re-)build the test image $ mkosi vm # Boot the image in qemu $ git add -p # interactively put together your patch diff --git a/test/integration-tests/standalone/meson.build b/test/integration-tests/standalone/meson.build index 76d11afcec..1b446ebe2d 100644 --- a/test/integration-tests/standalone/meson.build +++ b/test/integration-tests/standalone/meson.build @@ -3,8 +3,8 @@ # This meson file can be used to run the integration tests without having to install any other dependencies # as follows: # -# mkosi -f sandbox -- meson setup testsuite test/integration-tests/standalone # mkosi genkey +# mkosi -f sandbox -- meson setup testsuite test/integration-tests/standalone # mkosi -f # mkosi sandbox -- meson test -C testsuite # From e463d6bf698b9308e2d5fceed3608f587659ad2a Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 3 Apr 2025 16:38:31 +0200 Subject: [PATCH 2/2] mkosi: update fedora commit reference * 08ce156d74 fmf: Run mkosi genkey before mkosi summary * 1126a7c6b8 Download commit archives via full sha instead of short one * cc473d807f fmf: Check out mkosi to some directory in /var/tmp --- .packit.yml | 2 +- mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.packit.yml b/.packit.yml index 2793eb5589..acede2ad4c 100644 --- a/.packit.yml +++ b/.packit.yml @@ -39,7 +39,7 @@ jobs: trigger: pull_request fmf_url: https://src.fedoraproject.org/rpms/systemd # This is automatically updated by tools/fetch-distro.py --update fedora - fmf_ref: b17e5d64a1cd9f1ac2600c90ea93fcf9c5c11784 + fmf_ref: 08ce156d74460867657fb9b201c8be93d31e07de targets: - fedora-rawhide-x86_64 # testing-farm in the Fedora repository is explicitly configured to use testing-farm bare metal runners as diff --git a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf index 88970e3383..22ab093fcf 100644 --- a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf +++ b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf @@ -8,5 +8,5 @@ Distribution=|fedora Environment= GIT_URL=https://src.fedoraproject.org/rpms/systemd.git GIT_BRANCH=rawhide - GIT_COMMIT=b17e5d64a1cd9f1ac2600c90ea93fcf9c5c11784 + GIT_COMMIT=08ce156d74460867657fb9b201c8be93d31e07de PKG_SUBDIR=fedora