From ec9b149bb2ee38ea530094922975e40512294b81 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 16 Aug 2025 12:11:46 +0100 Subject: [PATCH 1/2] mkosi: update debian commit reference to 8ba719208ff28f36bc240328725eb10008838c39 * 8ba719208f systemd-boot: install kernel hooks to /usr/share/ * c4d6093398 Update changelog for 258~rc2-2 release * b21987b0f9 More NEWS updates about sysv support * cd7d07f66b NEWS: fixlets and adjustments * 34ef04cb45 Stop installing /var/lib/systemd in the package * 08b77c5b7c Update changelog for 258~rc2-1 release * 48b3ec2b9a systemd-container: update lintian overrides for more false positives * 31547d827b systemd-boot: make efibootmgr a dependency * 88a7261c00 d/t/control: prefer systemd-boot-tools if available * 478ea8945f systemd-boot: fix registering/removing uncompressed kernels * b072f60375 NEWS: fix typo * 985a3c8d56 systemd-boot: register interest in systemd-boot-signed trigger * f13b262bf6 d/rules: set debugoptimized for upstream builds * 615f8851e8 Install usr/share/factory files and restore nsswitch.conf/pam.d/issue on factory reset * 61792528f2 Update changelog for 258~rc1-1 release * 116371a1df d/copyright: update paths * 41437c9c54 Add a few more conflicts to packages providing the same files * 0e5eea70fd Fix Lintian warning debian-news-entry-uses-asterisk * 60595acb01 Update Lintian overrides * b8662ba796 Update symbols file for 258~rc1 * 58553602ca NEWS: note removal of telinit/runlevel * d78ade0842 Drop all workarounds that are obsolete after trixie * 7ef47f9f6b Drop world-writable /run/lock debianism * 9d6d3a4154 NEWS: note cgroupv1 removal * ef2ef6f35d Enable sd-vmspawn * ac2aec3b68 Add and remove files for 258~rc1 * 06582be4e6 d/watch: remove restriction to v257.x series * 88ccb1552a salsa-ci: enable arm64 build --- mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf index ab330aa654..7076c38d3d 100644 --- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf +++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf @@ -5,5 +5,5 @@ Environment= GIT_URL=https://salsa.debian.org/systemd-team/systemd.git GIT_SUBDIR=debian GIT_BRANCH=debian/master - GIT_COMMIT=61144ff7a6747bd3cc6340fbac38a8e15e9a239b + GIT_COMMIT=8ba719208ff28f36bc240328725eb10008838c39 PKG_SUBDIR=debian From f89480a0a7db6e498422b07726a690435039c30e Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 16 Aug 2025 12:13:20 +0100 Subject: [PATCH 2/2] mkosi: update mkosi commit reference to 5598b7f5793b6f63db5afaa39504a763fbaeb5cb * 5598b7f579 fedora: be more persistent when guessing what rawhide could be * cdd2d1570e Use apt-ftparchive instead of reprepro * eeb4ce6302 fix dead/404 link * 30a487d183 mkosi-tools: Drop systemd-boot-efi package * ad4b4d2cbe Add debug logging for version reported by systemd tools * 95f5c77fb7 mkosi-tools: move systemd-boot package to conf file matching older releases * 7da22f33e0 README: clarify that companion tools can also be enabled from the git repo * ec3fe91532 Drop microsecond resolution for datetime.now() * 9f7a53b687 mkosi-initrd: install raid rule with 70 prefix * 32c3ff4677 ci: give a hint about possible fixes for failing reuse lints * 489c5e9ecc build(deps): bump github/codeql-action from 3.29.2 to 3.29.5 --- .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 e174469caa..44e473ede9 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -25,7 +25,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@655baf24474a6f0732ec1b82a71c2f6fe4eeeb49 + - uses: systemd/mkosi@5598b7f5793b6f63db5afaa39504a763fbaeb5cb # 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 9adb113849..9e0e6b1437 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -38,7 +38,7 @@ jobs: LINTER_RULES_PATH: .github/linters GITHUB_ACTIONS_CONFIG_FILE: actionlint.yml - - uses: systemd/mkosi@655baf24474a6f0732ec1b82a71c2f6fe4eeeb49 + - uses: systemd/mkosi@5598b7f5793b6f63db5afaa39504a763fbaeb5cb - 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 deb972ebe8..d269ee18db 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -167,7 +167,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@655baf24474a6f0732ec1b82a71c2f6fe4eeeb49 + - uses: systemd/mkosi@5598b7f5793b6f63db5afaa39504a763fbaeb5cb # 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 28f0b582e2..c8e20bc6b1 100644 --- a/mkosi/mkosi.conf +++ b/mkosi/mkosi.conf @@ -1,7 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Config] -MinimumVersion=commit:655baf24474a6f0732ec1b82a71c2f6fe4eeeb49 +MinimumVersion=commit:5598b7f5793b6f63db5afaa39504a763fbaeb5cb Dependencies= exitrd initrd