From 57347e419926b378e49da9e34975e2529384c46d Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 6 Jun 2025 15:15:34 +0200 Subject: [PATCH 1/3] mkosi: update arch commit reference to 15cb472aeb4d93d7fae9c7b7bc2cd6723bc8ec85 * 15cb472aeb upgpkg: 257.6-1: new upstream release * 1c11767e01 upgpkg: 257.5-3: backlight: Drop support for actual_brightness * 489e88099e upgpkg: 257.5-2: fast-forward to current v257-stable --- mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf index 5b0c47eb2da..ba8508925e3 100644 --- a/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf +++ b/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf @@ -7,5 +7,5 @@ Distribution=arch Environment= GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git GIT_BRANCH=main - GIT_COMMIT=7948d79b633e1b6565b9264efd32b55247d66fcf + GIT_COMMIT=15cb472aeb4d93d7fae9c7b7bc2cd6723bc8ec85 PKG_SUBDIR=arch From 00f7afebb4d5bc0832ae3483c751aa803d1df99c Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 6 Jun 2025 15:16:05 +0200 Subject: [PATCH 2/3] mkosi: update opensuse commit reference to 2dc224ae5d446e928519315f4d46f76d1e34b8a8 * 2dc224ae5d Update systemd to version 257.6 / rev 448 via SR 1281804 * 15818e66dd Update systemd to version 257.5 / rev 447 via SR 1278063 * 2480ac89f0 Update 000product to rev 4383 * c381cdada8 update 2025-04-11 16:42 * bb036b2b8e Update systemd to version 257.4 / rev 444 via SR 1252776 * 55ae12d80b Update systemd to version 257.3 / rev 443 via SR 1249841 * a7fcf45b77 Update systemd to version 257.3 / rev 442 via SR 1247443 --- mkosi/mkosi.conf.d/opensuse/mkosi.conf | 3 ++- mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf | 3 ++- mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf | 2 +- .../build/mkosi.conf.d/opensuse/mkosi.build.chroot | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf index fee1e73c4f2..fbfa476bfb4 100644 --- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf +++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf @@ -23,8 +23,9 @@ VolatilePackages= systemd-experimental systemd-homed systemd-lang - systemd-network + systemd-networkd systemd-portable + systemd-resolved systemd-sysvcompat systemd-testsuite udev diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf index 6c57d04f65e..ac39456beaa 100644 --- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf +++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf @@ -14,8 +14,9 @@ VolatilePackages= systemd-experimental-debuginfo systemd-homed-debuginfo systemd-journal-remote-debuginfo - systemd-network-debuginfo + systemd-networkd-debuginfo systemd-portable-debuginfo + systemd-resolved-debuginfo systemd-sysvcompat-debuginfo systemd-testsuite-debuginfo udev-debuginfo diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf index ac1ddf5e929..0721a2e24df 100644 --- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf +++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf @@ -8,5 +8,5 @@ Environment= GIT_URL=https://github.com/bmwiedemann/openSUSE GIT_SUBDIR=packages/s/systemd GIT_BRANCH=master - GIT_COMMIT=9002a773f0ab185908dc8fb6c831c1cd9fdf11f0 + GIT_COMMIT=2dc224ae5d446e928519315f4d46f76d1e34b8a8 PKG_SUBDIR=opensuse diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot index 7b0e95e420c..ea1acb62f50 100755 --- a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot +++ b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot @@ -71,7 +71,7 @@ fi # to adapt. # # TODO: remove manual default-hierarchy patch when the upstream spec is updated -sed "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec" -e '1062,1075d' -e '/integration-tests\/README/d' -e '/default-hierarchy/ d' >/tmp/systemd.spec +sed "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec" -e '/integration-tests\/README/d' -e '/default-hierarchy/ d' >/tmp/systemd.spec mount --bind /tmp/systemd.spec "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec" build() { From f1fc8b5dea3cb0f219849bcbe44e603ad0ed370e Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 6 Jun 2025 15:16:08 +0200 Subject: [PATCH 3/3] mkosi: update fedora commit reference to 7de88c66bdc26920db570e67ef74e579f8461d9c * 7de88c66bd Do not mark symlinks as %ghost * 92c16c1dab Let systemd-{sysusers,shared} conflict with older systemd * ed6b885327 Version 257.6 * 5a53eac13c Package pcrlock files together with systemd-pcrlock * 2192e86112 Move mount.ddi symlinks to -container subpackage * 451184cbea Revert "Disable freezing of user sessions" * f6af46db12 Backport adb/fastboot udev rules (BZ#2356537) * f6b814cc0f Backport CI fix * d304477023 Version 257.5 --- .packit.yml | 2 +- mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.packit.yml b/.packit.yml index 723df85a53d..faca35c09cb 100644 --- a/.packit.yml +++ b/.packit.yml @@ -39,7 +39,7 @@ jobs: trigger: pull_request fmf_url: https://src.fedoraproject.org/rpms/systemd # This is automatically updated by tools/fetch-distro.py --update fedora - fmf_ref: 6646d13acae64665f63354cd60ecf963ee563b96 + fmf_ref: 7de88c66bdc26920db570e67ef74e579f8461d9c targets: - fedora-rawhide-x86_64 # testing-farm in the Fedora repository is explicitly configured to use testing-farm bare metal runners as diff --git a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf index 7cdcfb72eba..d617c332396 100644 --- a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf +++ b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf @@ -8,5 +8,5 @@ Distribution=|fedora Environment= GIT_URL=https://src.fedoraproject.org/rpms/systemd.git GIT_BRANCH=rawhide - GIT_COMMIT=6646d13acae64665f63354cd60ecf963ee563b96 + GIT_COMMIT=7de88c66bdc26920db570e67ef74e579f8461d9c PKG_SUBDIR=fedora