Two more mkosi updates (#36992)

This commit is contained in:
Daan De Meyer
2025-04-03 18:56:59 +02:00
committed by GitHub
4 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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 <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 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
@@ -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
@@ -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
#