morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

opensuse: Drop workarounds

Browse Source 
None of these should be needed anymore.
This commit is contained in:
Daan De Meyer
2025-03-07 14:55:08 +01:00
parent b9ad203e05
commit 3a16b02873
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
View File

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

3
mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
View File

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