systemd: Move some basic tools into own package

[ipfire-3.x.git] / systemd / systemd.nm

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index a010638288201e14ab050b261bc8f29ea399e1e1..a898c6826d308e01e8f5497d2965dc123f015d06 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 253
-release    = 2
+release    = 3
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -227,6 +227,7 @@ packages
                        python3-cairo
                        python3-dbus
                        python3-gobject3
+                       %{name}-basetools = %{thisver}
                        %{name}-libs = %{thisver}
                        util-linux >= 2.19
                end
@@ -315,6 +316,38 @@ packages
                end
        end
 
+       package %{name}-basetools
+               summary = Basetools from the systemd package, like sysuses and tmpfiles.
+               description
+                       This package contains some very basic tools from systemd like
+                       systemd-sysusers and systemd-tmpfiles.
+
+                       They mostly are required in a very early stage and shipping them
+                       in an own package allows us to handle this properly.
+               end
+
+               provides
+                       systemd-sysusers = %{thisver}
+                       systemd-tmpfiles = %{thisver}
+               end
+
+               requires
+                       %{name}-libs = %{thisver}
+               end
+
+               files
+                       %{bindir}/%{name}-sysusers
+                       %{bindir}/%{name}-tmpfiles
+                       %{mandir}/man1/%{name}-sysusers*
+                       %{mandir}/man1/%{name}-tmpfiles*
+
+                       # Only ship the sysusers.d folder without
+                       # any config files.
+                       /usr/lib/sysusers.d
+                       !/usr/lib/sysusers.d/*.conf
+               end
+       end
+
        package %{name}-libs
                template LIBS
        
@@ -339,6 +372,9 @@ packages
                        systemd < %{thisver}
                end
 
+               files += \
+                       %{libdir}/%{name}
+
                # Add myhostname to the hosts line of /etc/nsswitch.conf
                script postin
                        if [ -f "/etc/nsswitch.conf" ]; then