docs: Use mkosi -R instead of mkosi -t none (#36528)
mkosi now supports -R to rerun build scripts without rebuilding the image so let's document that instead of the current hack to prevent the rebuild by changing the output format.
This commit is contained in:
@@ -25,7 +25,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- uses: systemd/mkosi@87c540a5cf9fe24bb79fa946b9617d10e7f02b7e
|
||||
- uses: systemd/mkosi@6e64559161c1a5ed88ad1eacdd77f9a45cbbf6a6
|
||||
|
||||
# Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
|
||||
# immediately, we remove the files in the background. However, we first move them to a different location
|
||||
|
||||
@@ -120,7 +120,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- uses: systemd/mkosi@87c540a5cf9fe24bb79fa946b9617d10e7f02b7e
|
||||
- uses: systemd/mkosi@6e64559161c1a5ed88ad1eacdd77f9a45cbbf6a6
|
||||
|
||||
# Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
|
||||
# immediately, we remove the files in the background. However, we first move them to a different location
|
||||
|
||||
+6
-6
@@ -102,10 +102,10 @@ the following commands in another terminal on your host after booting the image
|
||||
machine):
|
||||
|
||||
```sh
|
||||
mkosi -t none && mkosi ssh -- dnf upgrade --disablerepo="*" --assumeyes "/work/build/*.rpm" # CentOS/Fedora
|
||||
mkosi -t none && mkosi ssh -- apt-get install "/work/build/*.deb" # Debian/Ubuntu
|
||||
mkosi -t none && mkosi ssh -- pacman --upgrade --needed --noconfirm "/work/build/*.pkg.tar" # Arch Linux
|
||||
mkosi -t none && mkosi ssh -- zypper --non-interactive install --allow-unsigned-rpm "/work/build/*.rpm" # OpenSUSE
|
||||
mkosi -R && mkosi ssh -- dnf upgrade --disablerepo="*" --assumeyes "/work/build/*.rpm" # CentOS/Fedora
|
||||
mkosi -R && mkosi ssh -- apt-get install "/work/build/*.deb" # Debian/Ubuntu
|
||||
mkosi -R && mkosi ssh -- pacman --upgrade --needed --noconfirm "/work/build/*.pkg.tar" # Arch Linux
|
||||
mkosi -R && mkosi ssh -- zypper --non-interactive install --allow-unsigned-rpm "/work/build/*.rpm" # OpenSUSE
|
||||
```
|
||||
|
||||
and optionally restart the daemon(s) you're working on using
|
||||
@@ -118,7 +118,7 @@ To build distribution packages for a specific distribution and release without
|
||||
building an actual image, the following command can be used:
|
||||
|
||||
```sh
|
||||
mkosi -d <distribution> -r <release> -t none
|
||||
mkosi -d <distribution> -r <release> -t none -f
|
||||
```
|
||||
|
||||
Afterwards the distribution packages will be located in
|
||||
@@ -126,7 +126,7 @@ Afterwards the distribution packages will be located in
|
||||
debuginfo packages, the following command can be used:
|
||||
|
||||
```sh
|
||||
mkosi -d <distribution> -r <release> -E WITH_DEBUG=1 -t none
|
||||
mkosi -d <distribution> -r <release> -E WITH_DEBUG=1 -t none -f
|
||||
```
|
||||
|
||||
To upgrade the systemd packages on the host system to the newer versions built
|
||||
|
||||
+2
-2
@@ -84,7 +84,7 @@ coverage for a new feature. Once you've finished writing the logic and want to r
|
||||
the following on the host:
|
||||
|
||||
```shell
|
||||
$ mkosi -t none
|
||||
$ mkosi -R
|
||||
```
|
||||
|
||||
This will rebuild the distribution packages without rebuilding the entire integration test image. Next, run
|
||||
@@ -98,7 +98,7 @@ $ systemctl start TEST-01-BASIC
|
||||
A soft-reboot is required to make sure all the leftover state from the previous run of the test is cleaned
|
||||
up by soft-rebooting into the btrfs snapshot we made before running the test. After the soft-reboot,
|
||||
re-running the test will first install the new packages we just built, make a new snapshot and finally run
|
||||
the test again. You can keep running the loop of `mkosi -t none`, `systemctl soft-reboot` and
|
||||
the test again. You can keep running the loop of `mkosi -R`, `systemctl soft-reboot` and
|
||||
`systemctl start ...` until the changes to the integration test are working.
|
||||
|
||||
If you're debugging a failing integration test (running `meson test --interactive` without `TEST_SHELL`),
|
||||
|
||||
Reference in New Issue
Block a user