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 bef5a0de29d49c531a80a52e6188f0f6ef1e24cb..1ada7640c2815478ee4b98b764442c7ba0da5376 100755 (executable)
--- 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() {