From 936a79084719de0cb9f5afc4da48b795b06cb109 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 4 Jun 2026 16:07:02 +0100 Subject: [PATCH] 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