From: Yu Watanabe Date: Sat, 17 Jan 2026 01:59:05 +0000 (+0900) Subject: mkosi/opensuse: do not build/install systemd-sysvcompat package X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff9c4ace709a1274b8f7e2569161da559c43fbd5;p=thirdparty%2Fsystemd.git mkosi/opensuse: do not build/install systemd-sysvcompat package The package is now empty. It is not necessary to build it. This also drops unnecessary modifications for files.*. --- diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf index 22fc22a0c9d..6f41df5da56 100644 --- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf +++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf @@ -25,7 +25,6 @@ VolatilePackages= systemd-networkd systemd-portable systemd-resolved - systemd-sysvcompat systemd-testsuite systemd-ukify udev 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 e14c8884a08..15001ff9fca 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 @@ -23,11 +23,7 @@ TS="${SOURCE_DATE_EPOCH:-$(date +%s)}" # when the upstream spec is updated while read -r filelist; do sed -E \ - -e 's/\.gz$//; /systemd-cgroups-agent/d; s/import-pubring.gpg/import-pubring.pgp/' \ - -e '/(initctl|runlevel|telinit)/ d' \ - -e 's/systemd-quotacheck.service.8/systemd-quotacheck@.service.8/' \ - -e '/systemd-sysv-generator/d' \ - -e '/rc-local/d' \ + -e 's/\.gz$//' \ "$filelist" >"/tmp/$(basename "$filelist")" mount --bind "/tmp/$(basename "$filelist")" "$filelist" done < <(find "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}" -name "files.*") @@ -97,6 +93,7 @@ build() { --noprep \ --build-in-place \ --with upstream \ + --without sysvcompat \ $( ((WITH_TESTS)) || echo "--nocheck") \ --define "_topdir /var/tmp" \ --define "_sourcedir $PWD/pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}" \