From 379bba482b694fc3e10cb3f69687d64a76a92eb7 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 17 Jun 2026 00:38:40 +0100 Subject: [PATCH 1/4] mkosi: install sysuser-tools in suse build images This provides the sysusers RPM macros that the new version of the spec file uses --- mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf | 1 + mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf index 6604b3bf2f..184be849a1 100644 --- a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf +++ b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf @@ -16,4 +16,5 @@ Packages= patterns-base-minimal_base rpm-build sed + sysuser-tools xz diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf index ac15f5c3be..a8b307c928 100644 --- a/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf +++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/opensuse.conf @@ -16,3 +16,4 @@ Packages= python3-ruff rpm-build ShellCheck + sysuser-tools From 785e4c00a769b97a73719ff65dbb7807b55fde8a Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 17 Jun 2026 01:22:09 +0100 Subject: [PATCH 2/4] mkosi: define ext_man macro in suse rpm build The suse spec now uses: %{_mandir}/man3/*.3%{?ext_man} which defaults to .gz and fails, as we disable compression. Redefine it to avoid a build failure: Processing files: systemd-doc-260.2-00.noarch error: File not found: /var/tmp/BUILD/systemd-260.2-build/BUILDROOT/usr/share/man/man3/*.3.gz --- .../mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot | 1 + 1 file changed, 1 insertion(+) 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 54dad2ad5e..3743dd86b8 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 @@ -95,6 +95,7 @@ build() { $( ((MESON_VERBOSE)) || echo "--undefine=__meson_verbose") \ --define "meson_extra_configure_options $MKOSI_MESON_OPTIONS $MESON_OPTIONS" \ --define "__os_install_post /usr/lib/rpm/brp-suse %{nil}" \ + --define "ext_man %{nil}" \ --define "__elf_exclude_path ^/usr/lib/systemd/tests/unit-tests/.*$" \ --define "__script_requires %{nil}" \ --define "_find_debuginfo_dwz_opts %{nil}" \ From db9d7265f5a2fe55e46f8ab408bcff6e0aa97d88 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 16 Jun 2026 23:01:33 +0100 Subject: [PATCH 3/4] mkosi: update opensuse commit reference to 462bd9f5eae8d113d0e477455278f64d0284afe8 * 462bd9f5ea Update systemd to version 260.2 / rev 469 via SR 1356344 * 28967f9151 Update systemd to version 260.1 / rev 468 via SR 1353801 * 086bdf7ca5 Update systemd to version 260.1 / rev 467 via SR 1348897 * 8e7d3d3067 Update systemd to version 259.5 / rev 466 via SR 1338788 * 069ac9826b Update systemd to version 259.3 / rev 465 via SR 1336527 * 7ed02aefd6 Update systemd to version 258.5 / rev 464 via SR 1335466 * 811b7f2076 Update systemd to version 258.4 / rev 463 via SR 1332808 * 45a28d7f95 Update systemd to version 258.3 / rev 462 via SR 1329291 * 37342ddc36 Update systemd to version 257.9 / rev 461 via SR 1324470 * 7eafa80da7 Update systemd to version 258.3 / rev 460 via SR 1323386 * 29c9ee6b49 Update systemd to version 257.9 / rev 459 via SR 1321158 * 39613f8d2e Update systemd to version 258.2 / rev 458 via SR 1320482 * c235f1dcf5 Update systemd to version 257.9 / rev 457 via SR 1305565 --- mkosi/mkosi.pkgenv/mkosi.conf.d/opensuse.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi/mkosi.pkgenv/mkosi.conf.d/opensuse.conf b/mkosi/mkosi.pkgenv/mkosi.conf.d/opensuse.conf index 6a2c8868f0..d711106ff3 100644 --- a/mkosi/mkosi.pkgenv/mkosi.conf.d/opensuse.conf +++ b/mkosi/mkosi.pkgenv/mkosi.conf.d/opensuse.conf @@ -8,5 +8,5 @@ Environment= GIT_URL=https://github.com/bmwiedemann/openSUSE GIT_SUBDIR=packages/s/systemd GIT_BRANCH=master - GIT_COMMIT=7d9cf5c934705c175766eaa688baa503da84e06a + GIT_COMMIT=462bd9f5eae8d113d0e477455278f64d0284afe8 PKG_SUBDIR=opensuse From b3c9dc95a81b5c7d4ea578e2fffb739ecd156d93 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 16 Jun 2026 23:01:13 +0100 Subject: [PATCH 4/4] mkosi: update debian commit reference to df071398a62e65b8c975e8a65f81162b46eca8ff * df071398a6 Update changelog for 261~rc4-1 release * 97cbe673fa Drop skip-not-installable autopkgtest restriction, deprecated * 5f639bd7b5 Override bogus Lintian warnings * 714ebbf53d Install new files from v264~rc4 * 25887faf4f Install new files for upstream build --- 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 1a86f7c7c6..043111078f 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=cde07547abb088a20acd28593e6d0ee25d403b63 + GIT_COMMIT=df071398a62e65b8c975e8a65f81162b46eca8ff PKG_SUBDIR=debian