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 22fc22a0c9d93f92f0a7e45f725aafccfdb18491..6f41df5da5684c653f1274bc79e582ddcc76ec72 100644 (file)
--- 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 e14c8884a081acdd8e5f08d817987e2f3ae297fa..15001ff9fcad4c91aa40efd1b4f81163bb9bbcc5 100755 (executable)
--- 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}" \