system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-29 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33502 from DaanDeMeyer/opensuse

Browse source 
mkosi: Drop s390x console patch from opensuse spec
This commit is contained in:
Luca Boccassi 2024-06-27 11:49:19 +02:00 committed by GitHub
parent fbdb7854a5 21942c008e
commit ae4c61bacc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
View file

@ -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

1
mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf.d/10-debug.conf
View file

@ -9,7 +9,6 @@ VolatilePackages=
libudev1-debuginfo
systemd-boot-debuginfo
systemd-container-debuginfo
systemd-coredump-debuginfo
systemd-debuginfo
systemd-debugsource
systemd-experimental-debuginfo

3
mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.prepare
View file

@ -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 \