From acd5fd0a6d8efdae53208ea9e173876683b43d7b Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 24 Jan 2026 13:19:28 +0000 Subject: [PATCH 1/2] mkosi: update debian commit reference to 6f4d90be5cb4075954f0a36653105e586a9a1fa9 * 6f4d90be5c Do not install autovt@ for upstream builds * 8cc28a6b82 Install new files for upstream build * 0d15255073 Use deb-systemd-invoke to reexec instead of manual calls * db04e5fa0b Use dh_installsystemd to handle journald and networkd * d8756a4c82 Use dh_installsystemd more to manage units * 40b23b0d5d d/tests: drop tests-in-lxd * 5821c5a350 d/control: have systemd-boot depend on efibootmgr for amd64 and arm64 only Follow-up for 072e72424b2e6da1c96489ef6996f49fabd46474 --- 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 f435febd4b..4d1c4d2232 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=93a222266c23ff73720f4de009a027d3556baee4 + GIT_COMMIT=6f4d90be5cb4075954f0a36653105e586a9a1fa9 PKG_SUBDIR=debian From c4fd3043ff7868d34251aed45a3d4dc1259c0b0f Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 24 Jan 2026 13:24:53 +0000 Subject: [PATCH 2/2] mkosi: workaround autovt removal in SUSE spec Follow-up for 072e72424b2e6da1c96489ef6996f49fabd46474 --- .../mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot | 2 ++ 1 file changed, 2 insertions(+) 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 5a05a34717..abc6829b40 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 @@ -18,8 +18,10 @@ TS="${SOURCE_DATE_EPOCH:-$(date +%s)}" # The openSUSE filelists hardcode the manpage compression extension. This causes rpmbuild errors since we # disable manpage compression as the files cannot be found. Fix the issue by removing the compression # extension. +# TODO: remove autovt@ removal when the upstream spec is updated while read -r filelist; do sed -E \ + -e '/autovt@/d' \ -e 's/\.gz$//' \ "$filelist" >"/tmp/$(basename "$filelist")" mount --bind "/tmp/$(basename "$filelist")" "$filelist"