diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-06-27 09:49:40 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-06-27 09:49:40 +0200 |
| commit | f92a005cd13ee1df95f3ea16e421f7757fb0f424 (patch) | |
| tree | 0dae758b0965d1037fab41f06d860cea2722837f /mkosi.images/system/mkosi.conf.d | |
| parent | Merge pull request #33493 from poettering/stub-refactor (diff) | |
| download | systemd-f92a005cd13ee1df95f3ea16e421f7757fb0f424.tar.xz systemd-f92a005cd13ee1df95f3ea16e421f7757fb0f424.zip | |
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.
Diffstat (limited to 'mkosi.images/system/mkosi.conf.d')
| -rwxr-xr-x | mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot | 3 | ||||
| -rwxr-xr-x | mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare | 3 |
2 files changed, 6 insertions, 0 deletions
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 3d6cc58b64..dbf3f2fa83 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 282a360bca..c57aa878b8 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 \ |