]> git.ipfire.org Git - thirdparty/mkosi.git/log
thirdparty/mkosi.git
10 hours agoMerge pull request #4297 from craftyguy/pmos-can-into-ci main
Jörg Behrmann [Thu, 18 Jun 2026 21:23:40 +0000 (23:23 +0200)] 
Merge pull request #4297 from craftyguy/pmos-can-into-ci

ci: add postmarketOS to integration testing

24 hours agocurl: Retry on failures
Martin Pitt [Thu, 18 Jun 2026 04:38:44 +0000 (06:38 +0200)] 
curl: Retry on failures

`curl()` is being used for things like fetching Fedora rawhide's GPG
key, opensuse's `/history/latest` or CentOS' `.composeinfo`. These are
all volatile and thus hard to pre-download/cache. But we've seen several
transient download failures like

> curl: (35) Recv failure: Connection reset by peer

Make these more robust with curl's retry (with exponential back-off)
mechanism.

34 hours agoci: enable postmarketOS in integration testing 4297/head
Clayton Craft [Fri, 8 May 2026 22:15:41 +0000 (15:15 -0700)] 
ci: enable postmarketOS in integration testing

2 days agoaction: install apk to /usr/bin
Clayton Craft [Mon, 15 Jun 2026 23:31:47 +0000 (16:31 -0700)] 
action: install apk to /usr/bin

/usr/local is cleaned up by ci.yml immediately after actions.yaml adds
apk into that dir, which leads to job that try to use apk to fail with
"apk not found"

2 days agomkosi-vm: add systemd-efistub to postmarketOS config
Clayton Craft [Mon, 11 May 2026 21:27:14 +0000 (14:27 -0700)] 
mkosi-vm: add systemd-efistub to postmarketOS config

On Alpine/pmOS, the EFI stub is split into a separate systemd-efistub
package rather than being bundled with systemd-boot, so it needs to
be added to the tools tree so mkosi can find it when building UKI/ESP
images.

2 days agomkosi.conf: add grub to postmarketOS
Clayton Craft [Sat, 9 May 2026 06:16:04 +0000 (23:16 -0700)] 
mkosi.conf: add grub to postmarketOS

2 days agomkosi-initrd: add sulogin, device-mapper to postmarketOS initrd
Clayton Craft [Sat, 9 May 2026 00:31:18 +0000 (17:31 -0700)] 
mkosi-initrd: add sulogin, device-mapper to postmarketOS initrd

sulogin is packaged separately on Alpine Linux, and this other pkg is
not pulled in automatically. Fixes emergency shell in the initrd

device-mapper is not pulled in automatically as a dependency, and needed
for lvm support

2 days agomkosi-tools: add missing packages to postmarketOS tools tree
Clayton Craft [Mon, 15 Jun 2026 23:45:25 +0000 (16:45 -0700)] 
mkosi-tools: add missing packages to postmarketOS tools tree

busybox's losetup, mount, and umount are missing many options supported
by the "full" versions so the "full" versions are added

sfdisk is packaged separately from util-linux on Alpine Linux

2 days agomkosi-tools: add apk-tools to tools trees for Arch and OpenSuSE
Clayton Craft [Mon, 11 May 2026 23:05:13 +0000 (16:05 -0700)] 
mkosi-tools: add apk-tools to tools trees for Arch and OpenSuSE

3 days agodnf: Work around librepo rejecting valid repomd signatures cross-distro
Martin Pitt [Mon, 15 Jun 2026 08:52:44 +0000 (10:52 +0200)] 
dnf: Work around librepo rejecting valid repomd signatures cross-distro

librepo 1.20 rejects valid repository metadata GPG signatures with gpgme
2.1 ("Bad GPG signature") [1]. This happens a lot when building a distro
which signs its repos (CentOS) on newer distros like Arch, Debian
testing, or openSUSE Tumbleweed, with their newer gpgme.

Thus until this is fixed, only validate repo GPG signatures when the
distributions match. We can assume that distros test their own dnf repos :-)

Revert once librepo gets fixed and into the distros.

[1] https://github.com/rpm-software-management/librepo/issues/376

3 days agodnf: Proper repository metadata signature requirement
Martin Pitt [Mon, 15 Jun 2026 07:09:52 +0000 (09:09 +0200)] 
dnf: Proper repository metadata signature requirement

mkosi only ever set `gpgcheck=1` (package signature verification) in the
generated dnf repository files and left `repo_gpgcheck` (repository
*metadata* signature verification) at the dnf default.

That default is not repository-aware. It is a global default of the dnf5
build doing the work, i.e. of the tools tree, not of the distribution
being built: Fedora's dnf5 defaults it to off, openSUSE's defaults it to
on. So whether repomd.xml.asc was verified depended on the tools tree
rather than on whether the repository actually publishes a signature,
and it ended up enabled for repositories that can never satisfy it.
Fedora and EPEL don't publish a repomd.xml.asc at all, and the CentOS
extras-common SIG repository signs it with the SIG key rather than the
main key we configure.

This stayed invisible because skip_if_unavailable was on by default too:
a repository that failed metadata verification was silently disabled and
makecache still succeeded. Now that we set `skip_if_unavailable=0`, those
failures are fatal, so the inherited default has to go.

Set `repo_gpgcheck` explicitly per repository instead. Default it to
"on", as repositories that do sign their metadata (e.g. CentOS BaseOS,
AppStream, CRB) benefit from it, and it should be an explicit opt-out
for new distros.

Explicitly turn it off for the ones that don't publish a verifiable
signature (Fedora, EPEL, CentOS extras-common). This makes the behaviour
deterministic regardless of the tools tree.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
3 days agodnf: Don't skip unavailable repositories during makecache
Martin Pitt [Mon, 15 Jun 2026 05:53:00 +0000 (07:53 +0200)] 
dnf: Don't skip unavailable repositories during makecache

`sync()` currently often fails to retrieve the GPG signature and writes
a warning, but still returns successfully:

> Status code: 404 for https://.../fedora/../repodata/repomd.xml.asc
> GPG verification is enabled, but GPG signature is not available

The subsequent package installation then fails with something like

> Failed to resolve the transaction:
> No match for argument: basesystem

This is confusing. Let's rather fail early at the root cause. Some
distributions seem to enable `skip_if_unavailable=1` by default, so
disable that option.

This was even worse for repositories that publish metadata GPG
signatures (e.g. CentOS Stream): a transient failure to retrieve or
verify repomd.xml.asc would make dnf silently skip the entire repository
and return success with an unusable cache, which made the whole build
unreproducible and unreliable.

3 days agorun_locale_gen: noop if output_format is confext
Paymon MARANDI [Wed, 25 Mar 2026 15:55:40 +0000 (11:55 -0400)] 
run_locale_gen: noop if output_format is confext

Signed-off-by: Paymon MARANDI <paymon@encs.concordia.ca>
4 days agotests: Make integration tests runnable locally
Martin Pitt [Thu, 11 Jun 2026 07:46:43 +0000 (09:46 +0200)] 
tests: Make integration tests runnable locally

Move integration test setup out of the workflow into a separate script,
and document how to run them.

5 days agoconfig: Don't propagate $MKOSI_DNF when using a tools tree
Simran Singh [Sat, 2 May 2026 17:29:31 +0000 (22:59 +0530)] 
config: Don't propagate $MKOSI_DNF when using a tools tree

5 days agobuild(deps): bump actions/upload-artifact from 7.0.0 to 7.0.1
dependabot[bot] [Sat, 2 May 2026 02:06:48 +0000 (02:06 +0000)] 
build(deps): bump actions/upload-artifact from 7.0.0 to 7.0.1

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/bbbca2ddaa5d8feaa63e36b76fdaad77386f024f...043fb46d1a93c77aae656e7c1c64a875d1fc6a0a)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 7.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
5 days agobuild(deps): bump aws-actions/configure-aws-credentials
dependabot[bot] [Sat, 2 May 2026 02:06:44 +0000 (02:06 +0000)] 
build(deps): bump aws-actions/configure-aws-credentials

Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases)
- [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md)
- [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/8df5847569e6427dd6c4fb1cf565c83acfa8afa7...ec61189d14ec14c8efccab744f656cffd0e33f37)

---
updated-dependencies:
- dependency-name: aws-actions/configure-aws-credentials
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
5 days agoMerge pull request #4353 from behrmann/ima
Zbigniew Jędrzejewski-Szmek [Sat, 13 Jun 2026 14:01:28 +0000 (16:01 +0200)] 
Merge pull request #4353 from behrmann/ima

Skip security.ima xattrs when copying tree as non-root

5 days agotree: check for root when copying SELinux attributes as well 4353/head
Jörg Behrmann [Sat, 13 Jun 2026 12:51:29 +0000 (14:51 +0200)] 
tree: check for root when copying SELinux attributes as well

A user complained that the previous check

    statfs(os.fspath(dst.parent)) != OVERLAYFS_SUPER_MAGIC or not tree_has_selinux_xattr(src)

worked for them when changing the or to and and

    statfs(os.fspath(dst.parent)) != OVERLAYFS_SUPER_MAGIC and not tree_has_selinux_xattr(src)

thus always excluding extended attributes when the tree contained SELinux
attributes, implying that not being root was the issue. Therefore this commit
pulls our the check for not being root out of the IMA attribute check.

It's only conjecture, but it seems unlikely that copying IMA attributes to
overlayfs would work, when SELinux doesn't. This allows to make the whole
handling more symmetrical.

13 days agovmspawn: Exclude secure-boot unless requested
Daan De Meyer [Fri, 5 Jun 2026 09:27:56 +0000 (09:27 +0000)] 
vmspawn: Exclude secure-boot unless requested

Otherwise vmspawn will still pick up firmware with support
for secure boot.

13 days agoSkip security.ima xattrs when copying tree as non-root
Zakir Jiwani [Mon, 6 Apr 2026 06:08:28 +0000 (06:08 +0000)] 
Skip security.ima xattrs when copying tree as non-root

Fixes: #4206
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2 weeks agoobs workflow: do not build aarch64/i586
Luca Boccassi [Thu, 4 Jun 2026 18:08:04 +0000 (19:08 +0100)] 
obs workflow: do not build aarch64/i586

Disable i586/aarch64 as they are unlikely to provide value
for money for this workflow.

2 weeks agoubuntu: Don't treat linux-tools-xxx as a kernel package
Daan De Meyer [Thu, 4 Jun 2026 14:11:13 +0000 (14:11 +0000)] 
ubuntu: Don't treat linux-tools-xxx as a kernel package

2 weeks agoobs: enable PR CI workflow
Luca Boccassi [Mon, 1 Jun 2026 22:16:40 +0000 (23:16 +0100)] 
obs: enable PR CI workflow

Build packages on OBS against the PR and reports status back
to Github. This just builds the mkosi package for now, next
step is to also build particleos images.

2 weeks agoaction: skip install of unavailable packages
Paul Meyer [Tue, 2 Jun 2026 14:43:02 +0000 (16:43 +0200)] 
action: skip install of unavailable packages

Some packages are not available on ubuntu-22.04 runners, skip them.

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
2 weeks agosandbox: Make seccomp work on alternative arches
Daan De Meyer [Wed, 20 May 2026 20:14:24 +0000 (20:14 +0000)] 
sandbox: Make seccomp work on alternative arches

2 weeks agoMerge pull request #4341 from martinpitt/install-tests
Luca Boccassi [Tue, 2 Jun 2026 10:21:21 +0000 (11:21 +0100)] 
Merge pull request #4341 from martinpitt/install-tests

Fix unit tests for package builds

2 weeks agotests: Mark install tests and run them separately 4341/head
Martin Pitt [Tue, 2 Jun 2026 09:21:17 +0000 (11:21 +0200)] 
tests: Mark install tests and run them separately

The unit tests also run during package builds, but test_install.py
requires network access (venv creation) and is generally not necessary
for most code changes. This also speeds up running the unit tests
considerably.

Thanks to Luca Boccassi for reporting!

Follow-up for b0f9525c2c74401fc4280c48233aa9831ced60d5

2 weeks agoFix linter unit tests at package build time
Luca Boccassi [Mon, 1 Jun 2026 21:37:29 +0000 (22:37 +0100)] 
Fix linter unit tests at package build time

Unit tests are broken as they expect a CI environment, but they are also
ran at package build time. Skip gracefully when the git or the
make-man-page.sh scripts are not available.

Follow-up for b0f9525c2c74401fc4280c48233aa9831ced60d5

2 weeks agotests: Avoid leading underscore in helper function
Martin Pitt [Tue, 2 Jun 2026 09:57:00 +0000 (11:57 +0200)] 
tests: Avoid leading underscore in helper function

We don't generally do that in mkosi.

2 weeks agodocs: Document debugging of failed sandbox commands
Martin Pitt [Tue, 2 Jun 2026 04:53:16 +0000 (06:53 +0200)] 
docs: Document debugging of failed sandbox commands

2 weeks agorun: Show complete sandbox command, factor out its logging
Martin Pitt [Tue, 2 Jun 2026 04:39:42 +0000 (06:39 +0200)] 
run: Show complete sandbox command, factor out its logging

Make the "sandbox command" copy-pasteable: Add the missing `--` and
include the failed command.

Also, DRY.

2 weeks agoDon't add El Torito boot catalog for BIOS/grub images by default
Martin Pitt [Mon, 1 Jun 2026 12:34:07 +0000 (14:34 +0200)] 
Don't add El Torito boot catalog for BIOS/grub images by default

systemd-repart v261 adds an El Torito boot catalog, which writes an
ISO9660 header to the image. grub-bios-setup interprets that header as a
filesystem on the bare disk and fails:

> warning: Attempting to install GRUB to a disk with multiple partition labels. This is not supported yet
> Embedding is not possible. GRUB can only be installed in this setup by
. using blocklists. However, blocklists are UNRELIABLE and their use is
. discouraged
> error: will not proceed with blocklists

Adjust auto mode to only add the El Torito catalog when grub is not
installed as the BIOS bootloader (`Explicit ElTorito=yes` still forces
it on). This goes back to the status quo ante until systemd 260 for
grub/BIOS.

Fixes #4337

2 weeks agoMerge pull request #4335 from martinpitt/unit-tests-local
Jörg Behrmann [Mon, 1 Jun 2026 15:27:48 +0000 (17:27 +0200)] 
Merge pull request #4335 from martinpitt/unit-tests-local

tests: Move unit tests from GitHub workflow into pytest

2 weeks agotests: Move unit tests from GitHub workflow into pytest 4335/head
Martin Pitt [Thu, 28 May 2026 16:19:23 +0000 (18:19 +0200)] 
tests: Move unit tests from GitHub workflow into pytest

Extract all CI linter/formatter/install checks from the GitHub workflow
into pytest tests. Workflows are hard to reproduce locally, and it's
much more convenient to reproduce what CI does with a simple `pytest`
command. Update the documentation and also stop recommending locally
installed `mypy` and friends -- let's always use the version from
`mkosi box` to get something halfway reproducible.

Keep the `sudo mkosi -h` test in the workflow, though -- it cannot run
inside `mkosi box` as that doesn't have `sudo`.

Some people like to run mypy and other linters from their own dev
environment. Skip tests whose tools aren't installed, but only if they
don't run in `mkosi box` -- in the latter (and in CI) we want to fail
tests, to avoid silently skipping tests due to accidentally dropping a
tool.

2 weeks agorun: Add `cwd` kwarg to run()/spawn()
Martin Pitt [Sun, 31 May 2026 09:39:42 +0000 (11:39 +0200)] 
run: Add `cwd` kwarg to run()/spawn()

2 weeks agosandbox: Fix pyright "possibly unbound variable" errors
Martin Pitt [Thu, 28 May 2026 16:31:09 +0000 (18:31 +0200)] 
sandbox: Fix pyright "possibly unbound variable" errors

When building the box with Fedora instead of Arch, pyright fails:

> mkosi/sandbox.py:889:50 - error: "parent" is possibly unbound (reportPossiblyUnboundVariable)
> mkosi/sandbox.py:889:59 - error: "base" is possibly unbound (reportPossiblyUnboundVariable)
> mkosi/sandbox.py:899:52 - error: "parent" is possibly unbound (reportPossiblyUnboundVariable)
> mkosi/sandbox.py:899:61 - error: "base" is possibly unbound (reportPossiblyUnboundVariable)

This isn't a bug: The variables are only used when nofollow=True, but
pyright cannot infer this from the control flow. Just quiesce this by
initializing the variables.

2 weeks agogitignore: Add generated man pages and zipapp builddir
Martin Pitt [Thu, 28 May 2026 16:24:12 +0000 (18:24 +0200)] 
gitignore: Add generated man pages and zipapp builddir

Ignore generated manpages and builddir/ (from generate-zipapp.sh).

The previous `.mkosi*.1` entries look wrong, and in any case this
generalizes the pattern.

2 weeks agopytest: Restrict discovery to tests/
Martin Pitt [Thu, 28 May 2026 16:04:36 +0000 (18:04 +0200)] 
pytest: Restrict discovery to tests/

Configure pytest to only look in tests/ directory. That will prevent
picking up test files inside of built artifacts (like mkosi.output/ or mkosi.tools/).

Fixes this failure of `bin/mkosi box -- python3 -m pytest`:

> ImportError while importing test module 'mkosi/mkosi.tools/usr/lib/python3.14/site-packages/mypyc/test/test_run.py'.
> E   ModuleNotFoundError: No module named 'distutils'

2 weeks agofinalize_scripts: tighten the PATH-strip condition to actual self-exec
Paul Meyer [Fri, 22 May 2026 07:21:51 +0000 (09:21 +0200)] 
finalize_scripts: tighten the PATH-strip condition to actual self-exec

The PATH-strip prelude exists to prevent `/scripts/<name>` from
recursing into itself when the script execs a binary named `<name>` via
PATH lookup. The current heuristic, `config.find_binary(name)`, checks a
broader condition: whether *some* binary called `<name>` exists in the
search path. That produces false positives for scripts that exec a
different binary entirely.

In particular, `mkosi-install` execs `dnf install $@`, expecting `dnf`
to resolve to the wrapped `/scripts/dnf` (which adds `--installroot=…`,
`--use-host-config`, `--setopt=…`). When the prelude gets emitted for
`mkosi-install` too, it strips `/scripts` from PATH before the exec, so
`dnf` resolves to the raw system binary and is invoked with none of the
wrapper's overrides.

Tighten the check: emit the prelude only when one of the exec'd argv
tokens is the unqualified string `name`, which is the only case where
PATH lookup could resolve back to `/scripts/<name>`.

Reproducer:

$ mkdir /tmp/repro && cd /tmp/repro
$ cat > mkosi.conf <<'EOF'
[Distribution]
Distribution=fedora
EOF
$ cat > mkosi.prepare <<'EOF'
mkosi-install --dump-main-config bash 2>&1 | grep '^installroot '
EOF
$ chmod +x mkosi.prepare
$ mkosi -ff build

Before: installroot = /
After: installroot = /buildroot

Co-developed-by: Claude Opus 4.7 <noreply@anthropic.com>
Signed-off-by: Paul Meyer <katexochen0@gmail.com>
3 weeks agosandbox: Add --debug option
Daan De Meyer [Tue, 26 May 2026 11:02:42 +0000 (11:02 +0000)] 
sandbox: Add --debug option

Let's allow debugging what is being mounted where
with a new --debug option

3 weeks agoMount /etc/resolv.conf symlink into sandbox
Daan De Meyer [Tue, 26 May 2026 10:58:04 +0000 (10:58 +0000)] 
Mount /etc/resolv.conf symlink into sandbox

Currently, if /etc/resolv.conf is a symlink, we
bind mount the actual file it points to into the
sandbox. Problem with this approach is that if the
file it points to is replaced on the host, creating
nested sandboxes will fail because bind mounting a
file whose source does not exist anymore fails with
ENOENT when you call mount.

To fix this (partially), make sure we bind mount the
/etc/resolv.conf symlink if it one. That way, on
resolved systems, we'll bind mount the /etc/resolv.conf
symlink and the /run/systemd/resolve directory into the
sandbox, with the latter containing the symlink target of
/etc/resolv.conf. Because we don't mount the target file
directly but its parent directory, if the file is replaced,
the sandbox will see the new file.

To make this work we add new --bind-nofollow and
--ro-bind-nofollow options to mkosi-sandbox.

3 weeks agonspawn: do not fail if --forward-journal is not available
Luca Boccassi [Tue, 26 May 2026 16:36:29 +0000 (17:36 +0100)] 
nspawn: do not fail if --forward-journal is not available

--forward-journal is only available in 261, which means we cannot use the
current mkosi main in the systemd stable branches. Check the version and
fallback to the previous implementation if it's older.

Follow-up for 2518468c650b3e4f4c457810255464003e923479

3 weeks agotools: move grub-pc-bin to arch-specific drop-in
Luca Boccassi [Tue, 26 May 2026 10:58:36 +0000 (11:58 +0100)] 
tools: move grub-pc-bin to arch-specific drop-in

2026-05-26T09:06:43.9842316Z Package grub-pc-bin is not available, but is referred to by another package.
2026-05-26T09:06:43.9842760Z This may mean that the package is missing, has been obsoleted, or
2026-05-26T09:06:43.9843062Z is only available from another source
2026-05-26T09:06:43.9843221Z
2026-05-26T09:06:43.9867449Z E: Package 'grub-pc-bin' has no installation candidate

https://github.com/systemd/systemd/actions/runs/26442527598/job/77840339559?pr=42300

4 weeks agoconfig: Add logging for default initrd selection
Daan De Meyer [Wed, 20 May 2026 20:14:06 +0000 (20:14 +0000)] 
config: Add logging for default initrd selection

4 weeks agoaction: Install apk
Daan De Meyer [Thu, 21 May 2026 09:04:25 +0000 (09:04 +0000)] 
action: Install apk

Required for postmarketos builds.

4 weeks agomkosi-initrd: Add libfdisk to PostmarketOS
Martin Pitt [Thu, 21 May 2026 15:42:36 +0000 (17:42 +0200)] 
mkosi-initrd: Add libfdisk to PostmarketOS

Commit 327644ececcabd3b left that out as I couldn't find it in the
package search. But the package is inherited from Alpine.

Thanks to Clayton Craft for pointing this out!

4 weeks agomkosi-initrd: Add libfdisk1
Martin Pitt [Thu, 21 May 2026 08:00:14 +0000 (10:00 +0200)] 
mkosi-initrd: Add libfdisk1

systemd-repart otherwise crashes on Debian with

> libfdisk.so.1 is not available

For consistency, add it to the other OSes, too.

4 weeks agopostmarketos: Fetch keys by default on Ubuntu
Daan De Meyer [Tue, 19 May 2026 18:58:13 +0000 (18:58 +0000)] 
postmarketos: Fetch keys by default on Ubuntu

Similar to rpm distros, we need a recent
distribution-gpg-keys package, so default to
fetching keys on ubuntu.

4 weeks agoFix typo in SELinux relabel instruction
rusty-snake [Wed, 20 May 2026 17:01:44 +0000 (19:01 +0200)] 
Fix typo in SELinux relabel instruction

4 weeks agofedora: allow Snapshot= for any kojipkgs-style mirror
Michael Vogt [Wed, 13 May 2026 16:03:13 +0000 (18:03 +0200)] 
fedora: allow Snapshot= for any kojipkgs-style mirror

The Snapshot= setting was gated to Release=rawhide and
Mirror=https://kojipkgs.fedoraproject.org with two hard die() checks,
but the URL builder underneath works for any release and any mirror
that mimics the koji compose layout.

So this commit drops the restrictions and just assuems a koji style
layout when snapshot is used. With that any koji style snapshot
can be used.

4 weeks agopostmarketos: Also pick up non arch specific keys
Daan De Meyer [Wed, 20 May 2026 07:14:04 +0000 (07:14 +0000)] 
postmarketos: Also pick up non arch specific keys

4 weeks agopostmarketos: Persist fetched keyring across Contexts
Daan De Meyer [Tue, 19 May 2026 20:15:49 +0000 (20:15 +0000)] 
postmarketos: Persist fetched keyring across Contexts

Extract the fetched alpine-keys/postmarketos-keys apks straight into
context.keyring_dir so the trusted keys survive between Contexts (e.g.
when building an image after sync_repository_metadata). The per-Context
sandbox_tree is discarded between phases, so writing only there would
cause the keys to disappear before setup() needs them. setup() now does
all the arch-specific key selection, reading from
context.keyring_dir/usr/share/apk/keys/<arch>/ as well as the tools tree.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
4 weeks agosandbox: split CLI and library entry points to fix console-script execution
Daan De Meyer [Tue, 19 May 2026 14:33:21 +0000 (14:33 +0000)] 
sandbox: split CLI and library entry points to fix console-script execution

When installed via pip/pipx/Nix, the mkosi-sandbox console-script calls
main() with __name__ == "mkosi.sandbox" rather than "__main__", so the
old is_main() check returned False and refused to execvp a trailing
command. Fix this by separating the two responsibilities: enter() is the
library function that sets up the sandbox in the current process and
returns any trailing argv, while main() is the CLI wrapper that calls
enter(), prints friendly error messages carried on a new SandboxOSError,
and execvp's the command. The console-script entry point points at
main() and works regardless of how it is invoked.

Fixes: https://github.com/systemd/mkosi/issues/4303
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
4 weeks agoMake full $PATH available when building tools tree
Daan De Meyer [Tue, 19 May 2026 12:43:46 +0000 (12:43 +0000)] 
Make full $PATH available when building tools tree

There's no risk of issues where stuff from $PATH expects
/usr from the host when building the tools tree or not using
it at all, so make the full $PATH available in that case.

This allows stuff like downloading apk to ~/.local/bin and
building postmarketos images.

To make this work we also have to mount /home into the sandbox.
This shouldn't be an issue generally. We don't expect tools to
accidentally pick stuff up from /home unless actually intended.

4 weeks agoapk: Implement repository_key_fetch for the postmarketOS distribution
Daan De Meyer [Tue, 19 May 2026 13:01:15 +0000 (13:01 +0000)] 
apk: Implement repository_key_fetch for the postmarketOS distribution

When repository_key_fetch is enabled, fetch the alpine-keys and postmarketos-keys
packages with --allow-untrusted, extract them, and copy the trusted public keys
into /etc/apk/keys/ in the sandbox tree so subsequent installs verify normally.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
4 weeks agopostmarketos: Add ruff to tools tree
Daan De Meyer [Tue, 19 May 2026 13:00:29 +0000 (13:00 +0000)] 
postmarketos: Add ruff to tools tree

4 weeks agoAdd newline when writing machine id into /etc/machine-id
Jörg Behrmann [Mon, 18 May 2026 15:46:19 +0000 (17:46 +0200)] 
Add newline when writing machine id into /etc/machine-id

Fixes: #4306
4 weeks agotools: add libtss2-tcti-device0 to opensuse tools tree
Jörg Behrmann [Mon, 18 May 2026 16:07:33 +0000 (18:07 +0200)] 
tools: add libtss2-tcti-device0 to opensuse tools tree

4 weeks agomkosi-initrd: Also add cryptsetup-libs explicitly to the initrd
Daan De Meyer [Sun, 17 May 2026 14:12:21 +0000 (14:12 +0000)] 
mkosi-initrd: Also add cryptsetup-libs explicitly to the initrd

And fix the name of the package on opensuse in the tools tree.

4 weeks agomkosi-initrd: Trim orphaned GPU/audio modules, add ACPI platform attrs
Daan De Meyer [Sun, 17 May 2026 14:03:59 +0000 (14:03 +0000)] 
mkosi-initrd: Trim orphaned GPU/audio modules, add ACPI platform attrs

The DRM and sound helpers (drm_buddy, drm_display_helper, ttm, intel-gtt,
mxm-wmi, snd-intel-dspcfg, snd-soc-hda-codec) had no actual KMS/audio
driver in the include list to pull them in, and there is no audio/GPU
userspace running in the initrd anyway. uvc and videobuf2-* are USB
webcam plumbing, also unused. Add firmware_attributes_class and
platform_profile so udev does not log autoload failures for those on
modern laptops.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
4 weeks agoMerge pull request #4298 from daandemeyer/push-tstyukqrtwtq
Jörg Behrmann [Mon, 18 May 2026 07:49:51 +0000 (09:49 +0200)] 
Merge pull request #4298 from daandemeyer/push-tstyukqrtwtq

mkosi-tools: Add some packages to the misc profile

4 weeks agomkosi-tools: Add fish to misc profile 4298/head
Daan De Meyer [Thu, 14 May 2026 07:46:44 +0000 (09:46 +0200)] 
mkosi-tools: Add fish to misc profile

Now that fish supports SHELL_PROMPT_PREFIX, it becomes more
viable again to run mkosi box -- /bin/fish since it will now
properly show that a box environment was entered. Hence let's
put it in the misc profile so that it is easily available in the
box environment.

4 weeks agomkosi-tools: Add jujutsu to misc profile
Daan De Meyer [Thu, 14 May 2026 07:27:50 +0000 (09:27 +0200)] 
mkosi-tools: Add jujutsu to misc profile

It's small, doesn't pull in any other deps we
don't already pull in, and seems popular enough
as a git alternative to include it by default.

4 weeks agomkosi-tools: Move gh to misc profile
Daan De Meyer [Mon, 11 May 2026 20:09:12 +0000 (22:09 +0200)] 
mkosi-tools: Move gh to misc profile

git lives there as well and I often want to have SCM tools
available without pulling other development tools so move gh
to the misc profile as well.

4 weeks agomkosi-tools: Add cryptsetup-libs to centos/fedora/opensuse
Daan De Meyer [Fri, 15 May 2026 17:48:20 +0000 (17:48 +0000)] 
mkosi-tools: Add cryptsetup-libs to centos/fedora/opensuse

With upcoming changes in systemd it might not be pulled in
by default anymore, add it explicitly hence.

5 weeks agobox: Drop background tinting
Daan De Meyer [Thu, 14 May 2026 08:17:01 +0000 (08:17 +0000)] 
box: Drop background tinting

Now that we have $SHELL_PROMPT_PREFIX integration,
let's drop the background tinting. Especially since it
doesn't quite nest all that well yet and we often invoke
nspawn and such from within mkosi box which does its own
background tinting.

5 weeks agomkosi-tools: Add libfido2
Daan De Meyer [Thu, 14 May 2026 08:35:32 +0000 (10:35 +0200)] 
mkosi-tools: Add libfido2

Required for interaction with hardware keys.

5 weeks agovmspawn: Use --ephemeral rather than copy_ephemeral()
Daan De Meyer [Thu, 14 May 2026 08:05:53 +0000 (10:05 +0200)] 
vmspawn: Use --ephemeral rather than copy_ephemeral()

5 weeks agoAdded second call to update kerneltype after kernel is defined
Anton Hvornum [Mon, 11 May 2026 12:45:10 +0000 (14:45 +0200)] 
Added second call to update kerneltype after kernel is defined

5 weeks agovmspawn: Forward journal-remote settings to vmspawn
Daan De Meyer [Mon, 11 May 2026 19:43:56 +0000 (21:43 +0200)] 
vmspawn: Forward journal-remote settings to vmspawn

Pass the same MaxUse/KeepFree/MaxFileSize/MaxFiles settings to vmspawn
via its new --forward-journal-* options that we configure in
systemd-journal-remote.conf for qemu.

5 weeks agonspawn: Use --forward-journal instead of running journal-remote ourselves
Daan De Meyer [Mon, 11 May 2026 19:47:19 +0000 (21:47 +0200)] 
nspawn: Use --forward-journal instead of running journal-remote ourselves

systemd-nspawn now supports --forward-journal with matching
--forward-journal-max-use, --forward-journal-keep-free,
--forward-journal-max-file-size and --forward-journal-max-files options,
so let it run systemd-journal-remote itself instead of doing it ourselves
via a bind-mounted unix socket.

5 weeks agoapk: skip removal of packages that aren't installed
Clayton Craft [Fri, 8 May 2026 02:47:55 +0000 (19:47 -0700)] 
apk: skip removal of packages that aren't installed

This fixes a failure when RemovePackages= listed package that wasn't
installed. The installed package database is queried first, and filter
to only packages that are actually present before calling apk del.
The query matches against both name and provides fields so packages
specified by a provider name are also found.

7 weeks agoconfig: switch to "pyright: ignore" comments were applicable
Jörg Behrmann [Wed, 29 Apr 2026 12:46:29 +0000 (14:46 +0200)] 
config: switch to "pyright: ignore" comments were applicable

7 weeks agoadd more logging around cache invalidation
Daan De Meyer [Tue, 28 Apr 2026 08:49:59 +0000 (10:49 +0200)] 
add more logging around cache invalidation

7 weeks agoMerge pull request #4282 from Gelbpunkt/pmos-all-architectures
Jörg Behrmann [Fri, 24 Apr 2026 20:22:33 +0000 (22:22 +0200)] 
Merge pull request #4282 from Gelbpunkt/pmos-all-architectures

postmarketOS: add all supported architectures

8 weeks agopostmarketOS: add all supported architectures 4282/head
Aelin [Thu, 23 Apr 2026 21:36:28 +0000 (23:36 +0200)] 
postmarketOS: add all supported architectures

This omits armhf, which is armv6, since mkosi only knows a single
architecture for all 32-bit ARM variants. It is eventually going to be
removed upstream anyways, so let's not bother with it.

8 weeks agopostmarketOS: sort architecture mapping
Aelin [Thu, 23 Apr 2026 21:34:26 +0000 (23:34 +0200)] 
postmarketOS: sort architecture mapping

2 months agoapk: Fix EBUSY in sync() when context.root is a mount point
Clayton Craft [Sat, 11 Apr 2026 00:18:48 +0000 (17:18 -0700)] 
apk: Fix EBUSY in sync() when context.root is a mount point

sync() temporarily moved context.root out of the way to get an empty
directory to run apk against without touching the image root. This fails
when context.root is a mount point, e.g. when Overlay= is enabled:

    OSError: [Errno 16] Resource busy: '...root' -> '...saved-root'

This uses a throwaway directory in the workspace instead, since apk
doesn't need to run against context.root specifically.

2 months agoMerge pull request #4270 from craftyguy/apk-caching-fixes
Jörg Behrmann [Wed, 15 Apr 2026 17:56:02 +0000 (19:56 +0200)] 
Merge pull request #4270 from craftyguy/apk-caching-fixes

apk: fix CacheOnly=always and CacheOnly=metadata

2 months agoapk: respect CacheOnly=always 4270/head
Clayton Craft [Mon, 6 Apr 2026 20:11:27 +0000 (13:11 -0700)] 
apk: respect CacheOnly=always

Without this, apk downloads uncached packages from upstream even when
the user explicitly requested offline operation (e.g. with
CacheOnly=always).

2 months agopostmarketOS: update repository mirror directory path
Clayton Craft [Mon, 6 Apr 2026 20:04:34 +0000 (13:04 -0700)] 
postmarketOS: update repository mirror directory path

See: https://postmarketos.org/edge/2026/03/15/pmaports-default-branch-changed/

2 months agoapk: respect CacheOnly for metadata caching
Clayton Craft [Mon, 6 Apr 2026 19:56:33 +0000 (12:56 -0700)] 
apk: respect CacheOnly for metadata caching

Previously --cache-max-age was unconditionally applied in install()
and scripts(), suppressing metadata refresh even with CacheOnly=never.
This updates it to respect the CacheOnly config option instead.

2 months agoRevert "Add Incremental=relaxed"
Daan De Meyer [Thu, 9 Apr 2026 09:52:24 +0000 (11:52 +0200)] 
Revert "Add Incremental=relaxed"

This does not work as a per distribution CacheKey= means that
we can switch between distributions without invalidating caches,
meaning the output files won't be removed yet will still be those
of the previous distribution rather than the new one.

Revert for now until I figure out a better approach.

This reverts commit a97c50044ce19d72e5119cd11af6993c3944ab65.

2 months agoAvoid invalidating all caches on mid-build-failure recovery
Daan De Meyer [Thu, 9 Apr 2026 08:28:43 +0000 (08:28 +0000)] 
Avoid invalidating all caches on mid-build-failure recovery

Previously, repository_metadata_needs_sync() returned True whenever any
Cacheonly=auto image lacked a cache, which caused run_clean() to wipe
every image cache to avoid partial-upgrade scenarios. As a result, if
mkosi was building several images for the first time and one of them
failed mid-way, the next run would re-sync metadata, wipe the caches of
the images that had already succeeded, and rebuild everything from
scratch.

Use the manifest file as a "previously cached" marker — it's written
when an image builds successfully and survives even after the cache
contents go stale — and only re-sync metadata (and invalidate all
caches) when every incremental image was previously cached and at least
one of them is now out of date. In the mid-build-failure case, the image
that failed never wrote a manifest, so we don't trigger the re-sync and
the surviving caches are preserved.

For all-non-incremental setups we keep the previous behavior of always
syncing — there are no caches to preserve and every build downloads
packages. In a mixed setup, the non-incremental images are ignored by
the heuristic and may eventually fail because of stale metadata, but
that's the cost of mixing them with incremental images we want to
preserve.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2 months agonspawn: Drop logic to run systemd-repart on the image before booting
Daan De Meyer [Fri, 3 Apr 2026 06:54:40 +0000 (08:54 +0200)] 
nspawn: Drop logic to run systemd-repart on the image before booting

This bit still requires root and it's unlikely we'll ever be able to
make it work unprivileged. Instead we should probably do something with
mstack in the future instead. But for now let's drop this logic so that
booting (verity signed) disk images works unprivileged on systems with
nsresourced and mountfsd.

2 months agovmspawn: Make sure we clean up auxiliary files as well
Daan De Meyer [Thu, 2 Apr 2026 21:16:20 +0000 (23:16 +0200)] 
vmspawn: Make sure we clean up auxiliary files as well

2 months agovmspawn: Set fewer credentials
Daan De Meyer [Sat, 28 Mar 2026 15:05:37 +0000 (16:05 +0100)] 
vmspawn: Set fewer credentials

This also fixes the accidentally commented out console=hvc0 in a
previous commit.

2 months agomkosi-tools: use correct pkg name for codespell on postmarketOS
Clayton Craft [Fri, 3 Apr 2026 00:11:44 +0000 (17:11 -0700)] 
mkosi-tools: use correct pkg name for codespell on postmarketOS

Fixes 31852c9314190b10376a009a380ffa527a57fae8

2 months agoFall back from nsresourced on UserNamespaceInterfaceNotSupported
Clayton Craft [Fri, 3 Apr 2026 01:21:26 +0000 (18:21 -0700)] 
Fall back from nsresourced on UserNamespaceInterfaceNotSupported

This fixes an issue with running mkosi on postmarketOS, where mkosi
was failing if nsresourced was unable to initialize BPF support. The
error is treated the same as InvalidParameter so mkosi falls back to an
unprivileged user namespace when the kernel lacks BPF LSM support.

Work to enable BPF LSM support there is ongoing[1].

1. https://gitlab.postmarketos.org/postmarketOS/pmaports/-/work_items/4411

2 months agoBuild UKI when making directory images with Bootable=auto
Daan De Meyer [Thu, 2 Apr 2026 11:29:27 +0000 (13:29 +0200)] 
Build UKI when making directory images with Bootable=auto

qemu supports direct kernel booting UKI images with virtiofs as the
rootfs so let's make that work by building UKIs if we're building
directory images with Bootable=auto. Importantly, we build a UKI
without an initrd in that case so that the time consuming step of
building the initrd is still skipped.

2 months agovmspawn: Support --console=headless
Daan De Meyer [Thu, 2 Apr 2026 11:45:35 +0000 (13:45 +0200)] 
vmspawn: Support --console=headless

vmspawn has support for --console=headless now.

2 months agovmspawn: Support booting UKIs and directory images with UKIs
Daan De Meyer [Thu, 2 Apr 2026 11:44:36 +0000 (13:44 +0200)] 
vmspawn: Support booting UKIs and directory images with UKIs

2 months agovmspawn: Support DiskType
Daan De Meyer [Thu, 2 Apr 2026 11:47:40 +0000 (13:47 +0200)] 
vmspawn: Support DiskType

2 months agoqemu: Support scsi-cd disk type
Daan De Meyer [Thu, 2 Apr 2026 11:47:21 +0000 (13:47 +0200)] 
qemu: Support scsi-cd disk type

For testing the el torito stuff.

2 months agoci: Update claude-review with latest changes from systemd
Daan De Meyer [Thu, 2 Apr 2026 06:57:10 +0000 (08:57 +0200)] 
ci: Update claude-review with latest changes from systemd

2 months agoAdd support for repart's new ElTorito settings
Daan De Meyer [Thu, 2 Apr 2026 08:22:16 +0000 (10:22 +0200)] 
Add support for repart's new ElTorito settings

2 months agoci: fix mypy failing because pytest 9 does not support python 3.9
Jörg Behrmann [Thu, 2 Apr 2026 08:34:26 +0000 (10:34 +0200)] 
ci: fix mypy failing because pytest 9 does not support python 3.9

2 months agomkosi-initrd: Add sr_mod to default kernel modules
Daan De Meyer [Thu, 2 Apr 2026 08:27:41 +0000 (10:27 +0200)] 
mkosi-initrd: Add sr_mod to default kernel modules

Required for cd devices like qemu's scsi-cd.

2 months agoAdd DriveType= setting for qemu root disk device type
Christian Brauner [Sat, 21 Mar 2026 12:54:27 +0000 (13:54 +0100)] 
Add DriveType= setting for qemu root disk device type

Add a new DriveType= setting that allows configuring the device type
used for the root disk when booting a virtual machine with qemu. The
supported types are virtio-blk (default, preserving existing behavior),
virtio-scsi, and nvme.

Previously, the only way to use nvme was by manually adding qemu device
arguments via QemuArgs=. This makes nvme a first-class option.

When Removable= is enabled, the drive type is forced to virtio-scsi
regardless of the DriveType= setting, preserving existing behavior.

Signed-off-by: Christian Brauner <brauner@kernel.org>