systemd: Update to 252

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index cd82ba0006757cac16916e196e7a3a1103440019..c8e378a3869e79da72a21e09434af53b43dbb128 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 242
-release    = 4
+version    = 252
+release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -47,6 +47,7 @@ build
                gperf
                hwdata
                intltool >= 0.51.0
+               kbd
                kmod-devel >= 15
                libacl-devel
                libblkid-devel
@@ -61,6 +62,7 @@ build
                pam-devel
                pciutils-devel
                python3-devel
+               python3-jinja2
                python3-lxml
                setup >= 3.0-13
                usbutils
@@ -88,8 +90,7 @@ build
                -Dsysusers=false \
                -Dtimesyncd=false \
                -Dtimedated=false \
-               -Dpolkit=false \
-               -Dstatic=false
+               -Dpolkit=false
 
        prepare_cmds
                %{create_groups}
@@ -107,9 +108,6 @@ build
                # Create dummy machine-id file, which is required for some tests.
                touch %{sysconfdir}/machine-id
 
-               # Generate temporary machine-id, which is required at least by the id128 test.
-               systemd-machine-id-setup
-
                # Run the testsuite.
                ninja test -v %{PARALLELISMFLAGS} -C build || true
        end
@@ -187,9 +185,6 @@ build
                        -e "s/^#ImportKernel=.*$/ImportKernel=yes/" \
                        -i %{BUILDROOT}/etc/systemd/journald.conf
 
-               # Install legacy tmpfile to autocreate /run/lock on startup.
-               install -v -m 644 %{DIR_APP}/tmpfiles.d/legacy.conf %{BUILDROOT}%{prefix}/lib/tmpfiles.d/
-
                # Remove udev rules for "predictable" network device renaming.
                # http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/
                rm -vf %{BUILDROOT}/usr/lib/udev/rules.d/80-net-name-slot.rules
@@ -230,8 +225,6 @@ end
 
 packages
        package %{name}
-               groups += Base
-
                prerequires += authconfig
 
                requires
@@ -245,6 +238,7 @@ packages
                end
 
                provides
+                       /bin/systemctl
                        /bin/systemd
                        /sbin/halt
                        /sbin/init
@@ -252,8 +246,10 @@ packages
                        /sbin/reboot
                        /sbin/shutdown
 
-                       syslog
                        udev = %{thisver}
+                       systemd-units = %{thisver}
+
+                       syslog
                end
 
                conflicts