From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 7 Mar 2025 13:55:08 +0000 (+0100)
Subject: opensuse: Drop workarounds
X-Git-Tag: v258-rc1~1150^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a16b0287378336507111e028d0af0004fd8c8d9;p=thirdparty%2Fsystemd.git

opensuse: Drop workarounds

None of these should be needed anymore.
---

diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
index f1cb7ba98fa..f3eba28e029 100755
--- a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
+++ b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
@@ -57,17 +57,6 @@ if ((COVERAGE)); then
     MKOSI_CFLAGS="$MKOSI_CFLAGS -fprofile-dir=/coverage"
 fi
 
-# TODO: Drop when the spec is fixed (either the patch is adapted or not applied when building for upstream).
-sed --in-place '/0009-pid1-handle-console-specificities-weirdness-for-s390.patch/d' "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec"
-
-# TODO: Drop when the opensuse spec uses README.md instead of README.testsuite.
-sed --in-place 's/README.testsuite/README.md/' "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec"
-
-# TODO: Drop when https://bugzilla.opensuse.org/show_bug.cgi?id=1236901 is resolved.
-sed '/%buildroot/d' /usr/lib/rpm/macros >macros
-mount --bind "$PWD/macros" /usr/lib/rpm/macros
-rm macros
-
 build() {
     IFS=
     # shellcheck disable=SC2046
diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
index de736a570f1..ab2a42d8b42 100755
--- a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
+++ b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
@@ -11,9 +11,6 @@ if [[ ! -f "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec" ]]; then
     exit 1
 fi
 
-# TODO: Drop when the spec is fixed (either the patch is adapted or not applied when building for upstream).
-sed --in-place '/0009-pid1-handle-console-specificities-weirdness-for-s390.patch/d' "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec"
-
 mkosi-chroot \
     rpmspec \
     --with upstream \