From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 5 Apr 2025 11:59:44 +0000 (+0900)
Subject: mkosi/opensuse: drop default-hierarchy from systemd.spec
X-Git-Tag: v258-rc1~903^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1d21129d0eef38f3a974dc1440d3b1027c76d62;p=thirdparty%2Fsystemd.git

mkosi/opensuse: drop default-hierarchy from systemd.spec
---

diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
index bef5a0de29d..1ada7640c28 100755
--- a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
@@ -69,7 +69,9 @@ fi
 # The opensuse spec tars up stuff in test/ and unpacks it in test/integration-tests, which we now use for our
 # own purposes, so let's get rid of that specific bit of logic in the opensuse spec until they've had a chance
 # to adapt.
-sed "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec" -e '1062,1075d' -e '/integration-tests\/README/d' >/tmp/systemd.spec
+#
+# TODO: remove manual default-hierarchy patch when the upstream spec is updated
+sed "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec" -e '1062,1075d' -e '/integration-tests\/README/d' -e '/default-hierarchy/ d' >/tmp/systemd.spec
 mount --bind /tmp/systemd.spec "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec"
 
 build() {