From: Yu Watanabe Date: Tue, 15 Jul 2025 19:55:32 +0000 (+0900) Subject: mkosi: patch filelists by opensuse X-Git-Tag: v258-rc1~48^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d48387623b7918eb4d2da6544997b994e5ca1b31;p=thirdparty%2Fsystemd.git mkosi: patch filelists by opensuse --- 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 8ec7500d7b7..76a8e08ee19 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 @@ -22,7 +22,11 @@ TS="${SOURCE_DATE_EPOCH:-$(date +%s)}" # 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 -E 's/\.gz$//; /systemd-cgroups-agent/d; s/import-pubring.gpg/import-pubring.pgp/; /(initctl|runlevel|telinit)/ d' "$filelist" >"/tmp/$(basename "$filelist")" + 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/' \ + "$filelist" >"/tmp/$(basename "$filelist")" mount --bind "/tmp/$(basename "$filelist")" "$filelist" done < <(find "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}" -name "files.*")