From 936a79084719de0cb9f5afc4da48b795b06cb109 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 4 Jun 2026 16:07:02 +0100 Subject: [PATCH 1/4] mkosi: update mkosi ref to 60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7 * 60ed8c964f ubuntu: Don't treat linux-tools-xxx as a kernel package * 24e5e532ab obs: enable PR CI workflow * 5edcd2c5ca action: skip install of unavailable packages * 4c18bc115b sandbox: Make seccomp work on alternative arches * a91c8730e2 tests: Mark install tests and run them separately * 923f72ea63 Fix linter unit tests at package build time * 3f4bee3392 tests: Avoid leading underscore in helper function * b2f04776c4 docs: Document debugging of failed sandbox commands * 461a1dd290 run: Show complete sandbox command, factor out its logging * d74c0b03d9 Don't add El Torito boot catalog for BIOS/grub images by default * b0f9525c2c tests: Move unit tests from GitHub workflow into pytest * 2889b5599b run: Add `cwd` kwarg to run()/spawn() * 3f7de100b8 sandbox: Fix pyright "possibly unbound variable" errors * 4cb9f337e2 gitignore: Add generated man pages and zipapp builddir * 49c1c78f3f pytest: Restrict discovery to tests/ * a9d7ab5e64 finalize_scripts: tighten the PATH-strip condition to actual self-exec * 145f4c259b sandbox: Add --debug option * df43e4007d Mount /etc/resolv.conf symlink into sandbox --- .github/workflows/coverage.yml | 2 +- .github/workflows/linter.yml | 2 +- .github/workflows/mkosi.yml | 2 +- .github/workflows/unit-tests.yml | 2 +- mkosi/mkosi.conf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 6aa59f6d09..3edcff25f5 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd with: persist-credentials: false - - uses: systemd/mkosi@3e15f6734a3455a008c3617f89a6c5010d5bb9bf + - uses: systemd/mkosi@60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7 # 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 diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 003122950a..d44ad6c746 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -40,7 +40,7 @@ jobs: GITHUB_ACTIONS_CONFIG_FILE: actionlint.yml ENABLE_GITHUB_PULL_REQUEST_SUMMARY_COMMENT: false - - uses: systemd/mkosi@3e15f6734a3455a008c3617f89a6c5010d5bb9bf + - uses: systemd/mkosi@60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7 - name: Check that tabs are not used in Python code run: sh -c '! git grep -P "\\t" -- src/core/generate-bpf-delegate-configs.py src/boot/generate-hwids-section.py src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py' diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 7d50bb13aa..f831536ba8 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -169,7 +169,7 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd with: persist-credentials: false - - uses: systemd/mkosi@3e15f6734a3455a008c3617f89a6c5010d5bb9bf + - uses: systemd/mkosi@60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7 # 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 diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index d265c993c7..085a4b091a 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -74,7 +74,7 @@ jobs: with: persist-credentials: false - - uses: systemd/mkosi@3e15f6734a3455a008c3617f89a6c5010d5bb9bf + - uses: systemd/mkosi@60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7 - name: Install apk # ubuntu-24.04 doesn't package apk, so fetch the official statically-linked binary from diff --git a/mkosi/mkosi.conf b/mkosi/mkosi.conf index bff2efbdee..2216ada89d 100644 --- a/mkosi/mkosi.conf +++ b/mkosi/mkosi.conf @@ -1,7 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Config] -MinimumVersion=commit:3e15f6734a3455a008c3617f89a6c5010d5bb9bf +MinimumVersion=commit:60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7 Dependencies= minimal-base minimal-0 From 10f8544727a9fcdc0580420c475f459be40586ef Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 4 Jun 2026 15:40:27 +0100 Subject: [PATCH 2/4] mkosi: fix various TriggerMatch conditions TriggerMatch is an AND by default, so when multiple Release matches are defined, they need to be prefixed by '|' --- .../debian-ubuntu/mkosi.conf.d/isc-dhcp.conf | 12 ++++++------ .../mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf | 4 ++-- .../mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf | 4 ++-- .../mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/isc-dhcp.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/isc-dhcp.conf index 2977041fd9..d22865feae 100644 --- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/isc-dhcp.conf +++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/isc-dhcp.conf @@ -2,15 +2,15 @@ [TriggerMatch] Distribution=debian -Release=bullseye -Release=bookworm -Release=trixie +Release=|bullseye +Release=|bookworm +Release=|trixie [TriggerMatch] Distribution=ubuntu -Release=jammy -Release=noble -Release=questing +Release=|jammy +Release=|noble +Release=|questing [Content] Packages=isc-dhcp-server diff --git a/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf index b680604f00..7cc69182a1 100644 --- a/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf +++ b/mkosi/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf @@ -2,8 +2,8 @@ [TriggerMatch] Distribution=ubuntu -Release=jammy -Release=noble +Release=|jammy +Release=|noble [Content] Packages= diff --git a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf index b680604f00..7cc69182a1 100644 --- a/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf +++ b/mkosi/mkosi.images/minimal-base/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf @@ -2,8 +2,8 @@ [TriggerMatch] Distribution=ubuntu -Release=jammy -Release=noble +Release=|jammy +Release=|noble [Content] Packages= diff --git a/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf b/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf index b680604f00..7cc69182a1 100644 --- a/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf +++ b/mkosi/mkosi.initrd.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/coreutils.conf @@ -2,8 +2,8 @@ [TriggerMatch] Distribution=ubuntu -Release=jammy -Release=noble +Release=|jammy +Release=|noble [Content] Packages= From 9af2237436db798b2130b98f18a44639220eae4c Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 4 Jun 2026 14:44:09 +0100 Subject: [PATCH 3/4] mkosi: pull in linux-tools-generic for jammy/noble The build dependency is dropped from the package as it breaks resolute builds, pull in manually in jammy/noble, as it's needed for the 'real' bpftool binary --- .../mkosi.conf.d/linux-tools-generic.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/linux-tools-generic.conf diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/linux-tools-generic.conf b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/linux-tools-generic.conf new file mode 100644 index 0000000000..b777a41490 --- /dev/null +++ b/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/linux-tools-generic.conf @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# bpftool was untangled in resolute, needs linux-tools-generic in older releases + +[TriggerMatch] +Distribution=ubuntu +Release=|jammy +Release=|noble + +[Content] +Packages=linux-tools-generic From b0effdc1f679edf1889f7127a6cbf04a64193455 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 4 Jun 2026 13:25:31 +0100 Subject: [PATCH 4/4] mkosi: update debian commit reference to cde07547abb088a20acd28593e6d0ee25d403b63 * cde07547ab Update changelog for 261~rc3-1 release * 13a29e5eda Drop unused Lintian overrides * 84c4af7e23 Drop now-autogenerated dlopen recommends/suggests * 76995069a0 Drop dlopen:Depends from libsystemd-dev * 91bb1e5423 Add ${dlopen:Depends} placeholder to all packages shipping ELF binaries * 7e333f2b9c Drop bpftool build-dep workaround for Jammy/Noble * 8a17f61489 Update changelog for 261~rc2-1 release * 58ad925b52 Drop patches, all merged upstream * e53db5cc8f Move conflict with runit helper to sd-sysv * adb081fde6 Workaround piuparts issue with / permissions * 457f16e3cf Clean up autovt@ alias on purge * bc0bd48fc8 Update changelog for 261~rc1-1 release * 537d92f8ae Force linking against libm * 87622cc5ee Backport patch to skip test-pressure in autopkgtest * 5b7253e3f9 Update symbols file for new version * bcf39279f8 Backport patch to fix unit test in gitlab CI * e654d67b76 Install new files for upstream release * 9b724fd2c1 Bump Standards-version to 4.7.4, no changes --- mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf index 73bcf958d6..1a86f7c7c6 100644 --- a/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf +++ b/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf @@ -9,5 +9,5 @@ Environment= GIT_URL=https://salsa.debian.org/systemd-team/systemd.git GIT_SUBDIR=debian GIT_BRANCH=debian/master - GIT_COMMIT=3e1930512d1efee7e11b619a5f493b3229594a51 + GIT_COMMIT=cde07547abb088a20acd28593e6d0ee25d403b63 PKG_SUBDIR=debian