From 4c1905b64a436c7fad766da0712ed3eec4ecea8b Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 25 Jun 2026 09:26:23 +0100 Subject: [PATCH] mkosi: update mkosi ref to f7762b71437227922a367bb89597843c77494ef9 * f7762b7143 sandbox: Preserve net caps across user namespace before unsharing net * 582eadee34 Revert "Put build history into the output directory" * 5ef262bc53 action: don't fail if apk cannot be downloaded * bdd341ff9b Lock the package cache during package manager invocations * da49fe976c Put build history into the output directory * 1c392f1918 tests: Use unique machine names * e4f4026e30 tests: Reduce VM RAM size * de41a5e03e Don't leak gpg-agent when signing with gpg * 1bc5d61e1d ci: Pin openSUSE to second-to-last Tumbleweed snapshot * c4d565a009 test: Use the main build's snapshot for extension builds * 718b06c866 tests: ignore masked units in check-and-shutdown * 0dc5ecbc02 ci: enable postmarketOS in integration testing * d4c6761ad3 action: install apk to /usr/bin * 9980f31309 mkosi-vm: add systemd-efistub to postmarketOS config * 5640ace38f mkosi.conf: add grub to postmarketOS * 6741b440c0 mkosi-initrd: add sulogin, device-mapper to postmarketOS initrd * c3575c035c mkosi-tools: add missing packages to postmarketOS tools tree * 0774bc2498 mkosi-tools: add apk-tools to tools trees for Arch and OpenSuSE | * bb87e48401 curl: Retry on failures |/ * 41fea1dd8d dnf: Work around librepo rejecting valid repomd signatures cross-distro * 647e3b610b dnf: Proper repository metadata signature requirement * 46d907cce2 dnf: Don't skip unavailable repositories during makecache * a91e89c3b7 run_locale_gen: noop if output_format is confext * 30329e401b tests: Make integration tests runnable locally * be549f04db config: Don't propagate $MKOSI_DNF when using a tools tree * 42ed648981 build(deps): bump actions/upload-artifact from 7.0.0 to 7.0.1 * fd5eedd62b build(deps): bump aws-actions/configure-aws-credentials * 86733c703d tree: check for root when copying SELinux attributes as well * de2256f8fe Skip security.ima xattrs when copying tree as non-root | * 08ebf6d678 vmspawn: Exclude secure-boot unless requested |/ * 1d3c51e36d obs workflow: do not build aarch64/i586 (cherry picked from commit 45f561bf12aef708eeac5520ae3a137dca2205d0) (cherry picked from commit 44c5ab5d71064d33e46234dc2098c584223b4cfa) (cherry picked from commit e5f72a0ce24389d21a687f8e95f851cd42aa2a6a) --- .github/workflows/coverage.yml | 2 +- .github/workflows/linter.yml | 2 +- .github/workflows/mkosi.yml | 2 +- mkosi/mkosi.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index a2e2db256ce..1c5e26d2c5d 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@60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7 + - uses: systemd/mkosi@f7762b71437227922a367bb89597843c77494ef9 # 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 6063af57170..81cd8d936fe 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@60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7 + - uses: systemd/mkosi@f7762b71437227922a367bb89597843c77494ef9 - 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 94d7c062ffb..5ce7c7e2129 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -180,7 +180,7 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd with: persist-credentials: false - - uses: systemd/mkosi@60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7 + - uses: systemd/mkosi@f7762b71437227922a367bb89597843c77494ef9 # 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/mkosi/mkosi.conf b/mkosi/mkosi.conf index e1de083c78c..2fd123be53c 100644 --- a/mkosi/mkosi.conf +++ b/mkosi/mkosi.conf @@ -1,7 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Config] -MinimumVersion=commit:60ed8c964f8d98aa4b325f381c4b3bc6de91a0b7 +MinimumVersion=commit:f7762b71437227922a367bb89597843c77494ef9 Dependencies= exitrd initrd