From: Yu Watanabe Date: Mon, 21 Apr 2025 04:38:01 +0000 (+0900) Subject: mkosi: drop SysV compat files from packages X-Git-Tag: v258-rc1~58^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3116558ade4fe6ddc81ca2d369d519aa01e73bf;p=thirdparty%2Fsystemd.git mkosi: drop SysV compat files from packages These workarounds can be dropped when the downstream .spec or filelists are updated. --- 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 ac7202c1d02..8ec7500d7b7 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 @@ -19,9 +19,10 @@ TS="${SOURCE_DATE_EPOCH:-$(date +%s)}" # disable manpage compression as the files cannot be found. Fix the issue by removing the compression # extension. # -# TODO: remove manual cgroups-agent and pubring patches when the upstream spec is updated +# TODO: remove patches for removal of cgroups-agent, renaming pubring file, and removal of sysv files +# when the upstream spec is updated while read -r filelist; do - sed 's/\.gz$//; /systemd-cgroups-agent/d; s/import-pubring.gpg/import-pubring.pgp/' "$filelist" >"/tmp/$(basename "$filelist")" + sed -E 's/\.gz$//; /systemd-cgroups-agent/d; s/import-pubring.gpg/import-pubring.pgp/; /(initctl|runlevel|telinit)/ d' "$filelist" >"/tmp/$(basename "$filelist")" mount --bind "/tmp/$(basename "$filelist")" "$filelist" done < <(find "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}" -name "files.*")