From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 6 Jun 2025 13:16:05 +0000 (+0200)
Subject: mkosi: update opensuse commit reference to 2dc224ae5d446e928519315f4d46f76d1e34b8a8
X-Git-Tag: v258-rc1~311^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00f7afebb4d5bc0832ae3483c751aa803d1df99c;p=thirdparty%2Fsystemd.git

mkosi: update opensuse commit reference to 2dc224ae5d446e928519315f4d46f76d1e34b8a8

* 2dc224ae5d Update systemd to version 257.6 / rev 448 via SR 1281804
* 15818e66dd Update systemd to version 257.5 / rev 447 via SR 1278063
* 2480ac89f0 Update 000product to rev 4383
* c381cdada8 update 2025-04-11 16:42
* bb036b2b8e Update systemd to version 257.4 / rev 444 via SR 1252776
* 55ae12d80b Update systemd to version 257.3 / rev 443 via SR 1249841
* a7fcf45b77 Update systemd to version 257.3 / rev 442 via SR 1247443
---

diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf
index fee1e73c4f2..fbfa476bfb4 100644
--- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf
+++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf
@@ -23,8 +23,9 @@ VolatilePackages=
         systemd-experimental
         systemd-homed
         systemd-lang
-        systemd-network
+        systemd-networkd
         systemd-portable
+        systemd-resolved
         systemd-sysvcompat
         systemd-testsuite
         udev
diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf
index 6c57d04f65e..ac39456beaa 100644
--- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf
+++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf
@@ -14,8 +14,9 @@ VolatilePackages=
         systemd-experimental-debuginfo
         systemd-homed-debuginfo
         systemd-journal-remote-debuginfo
-        systemd-network-debuginfo
+        systemd-networkd-debuginfo
         systemd-portable-debuginfo
+        systemd-resolved-debuginfo
         systemd-sysvcompat-debuginfo
         systemd-testsuite-debuginfo
         udev-debuginfo
diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
index ac1ddf5e929..0721a2e24df 100644
--- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
+++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
@@ -8,5 +8,5 @@ Environment=
         GIT_URL=https://github.com/bmwiedemann/openSUSE
         GIT_SUBDIR=packages/s/systemd
         GIT_BRANCH=master
-        GIT_COMMIT=9002a773f0ab185908dc8fb6c831c1cd9fdf11f0
+        GIT_COMMIT=2dc224ae5d446e928519315f4d46f76d1e34b8a8
         PKG_SUBDIR=opensuse
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 7b0e95e420c..ea1acb62f50 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
@@ -71,7 +71,7 @@ fi
 # to adapt.
 #
 # 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
+sed "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec" -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() {