From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 27 Jun 2024 07:49:40 +0000 (+0200)
Subject: mkosi: Drop s390x console patch from opensuse spec
X-Git-Tag: v257-rc1~1040^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f92a005cd13ee1df95f3ea16e421f7757fb0f424;p=thirdparty%2Fsystemd.git

mkosi: Drop s390x console patch from opensuse spec

This patch does not apply anymore on upstream, so let's remove it
from the spec before building until the spec is fixed.
---

diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
index 3d6cc58b64d..dbf3f2fa83e 100755
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
@@ -67,6 +67,9 @@ if ((WIPE)); then
     MKOSI_MESON_OPTIONS="$MKOSI_MESON_OPTIONS --wipe"
 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/$ID/systemd.spec"
+
 build() {
     IFS=
     # shellcheck disable=SC2046
diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare
index 282a360bca3..c57aa878b8b 100755
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare
@@ -15,6 +15,9 @@ if [ ! -f "pkg/$ID/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/$ID/systemd.spec"
+
 for DEPS in --requires --buildrequires; do
     mkosi-chroot \
         rpmspec \