]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blobdiff - systemd/systemd.nm
systemd: Add legacy tmpfile for autocreate /run/lock directory.
[people/ms/ipfire-3.x.git] / systemd / systemd.nm
index 95bf4f744132d65aee6e31538b32bd59c770c197..d93414bc3f712bf8d3398cb8817e1ba89c9886ce 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 44
-release    = 4
+version    = 196
+release    = 3
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -24,41 +24,47 @@ build
        unitdir = %{prefix}/lib/systemd/system
 
        requires
+               attr-devel
                audit-devel
                automake
                autoconf
-               cryptsetup-luks-devel
+               cryptsetup-luks-devel >= 1.4.2
                dbus-devel
                docbook-utils
                docbook-xsl
-               gperf
                gettext-devel
+               glib2-devel
+               gobject-introspection-devel >= 1.31
+               gperf
+               hwdata
                intltool
                kmod-devel >= 5
                libacl-devel
+               libblkid-devel
                libcap-devel
+               libgcrypt-devel
                libselinux-devel
                libtool
-               libudev-devel >= 172
+               libuuid-devel
                pam-devel
+               pciutils-devel
+               usbutils
                vala
                xz-devel
        end
 
        configure_options += \
-               --libexecdir=%{libdir} \
-               --with-udevrulesdir=%{prefix}/lib/udev/rules.d \
-               --with-distro=ipfire
+               --with-distro=ipfire \
+               --disable-static
 
        prepare_cmds
                ./autogen.sh ac
        end
 
-       test
-               make check
-       end
-
        install_cmds
+               # Create folder in log to store the journal.
+               mkdir -pv %{BUILDROOT}/var/log/journal
+
                # Create sysv compatible symlinks.
                mkdir -pv %{BUILDROOT}%{sbindir}
                ln -svf ../lib/systemd/systemd  %{BUILDROOT}/%{sbindir}/init
@@ -86,6 +92,10 @@ build
                rm -rfv %{BUILDROOT}%{unitdir}/runlevel*
                rm -rfv %{BUILDROOT}%{unitdir}/graphical.target
 
+               # Remove service files for utmp update.
+               rm -rvf %{BUILDROOT}%{unitdir}/systemd-update-utmp-*.service
+               rm -rvf %{BUILDROOT}%{unitdir}/shutdown.target.wants/systemd-update-utmp-*.service
+
                # Set default target to multi-user
                ln -svf multi-user.target %{BUILDROOT}%{unitdir}/default.target
 
@@ -95,32 +105,36 @@ build
                        ln -svf ../system/${i}.target ${i}.target || exit 1
                done
 
-               # Replace absolute symlink for getty@tty1.service.
-               ln -svf ../../../../%{unitdir}/getty@.service \
-                       %{BUILDROOT}%{sysconfdir}/systemd/system/getty.target.wants/getty@tty1.service
-
-               # Replace absolute symlink for remote-fs.target.
-               ln -svf ../../../../%{unitdir}/remote-fs.target \
-                       %{BUILDROOT}%{sysconfdir}/systemd/system/multi-user.target.wants/remote-fs.target
-
                # Remove tmpfile for X11
                rm -rfv %{BUILDROOT}/usr/lib/tmpfiles.d/x11.conf
 
                # Remove unneeded symlink for xdg
                rm -rfv %{BUILDROOT}/etc/xdg/systemd
+
+               # Use journald. Enable the import of kernel messages.
+               # Stop forwarding to a syslog daemon.
+               sed \
+                       -e "s/^#ForwardToSyslog=.*$/ForwardToSyslog=no/" \
+                       -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/
        end
 end
 
 packages
        package %{name}
+               groups += Base
+
                prerequires += authconfig
 
                requires
                        dbus
+                       hwdata
                        python-cairo
                        python-dbus
                        %{name}-units=%{thisver}
-                       udev>=172
                        util-linux>=2.19
                end
 
@@ -131,13 +145,41 @@ packages
                        /sbin/poweroff
                        /sbin/reboot
                        /sbin/shutdown
+
+                       syslog
+                       udev = %{thisver}
                end
 
                conflicts
+                       dracut < 019
                        filesystem < 002
+                       rsyslog < 5.8.6-4
                        upstart
                end
 
+               obsoletes
+                       udev < 183
+               end
+
+               configfiles
+                       /etc/locale.conf
+                       /etc/machine-id
+                       /etc/systemd/journald.conf
+                       /etc/systemd/logind.conf
+                       /etc/systemd/system.conf
+                       /etc/systemd/user.conf
+                       /etc/udev/udev.conf
+                       /etc/vconsole.conf
+               end
+
+               script prein
+                       # Create groups for udev.
+                       getent group cdrom >/dev/null || groupadd -g 11 cdrom || :
+                       getent group tape >/dev/null || groupadd -g 33 tape || :
+                       getent group dialout >/dev/null || groupadd -g 18 dialout || :
+                       getent group floppy >/dev/null || groupadd -g 19 floppy || :
+               end
+
                script postin
                        # Generate Machine ID.
                        /usr/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
@@ -152,11 +194,36 @@ packages
                                # Try harder
                                grep -q pam_systemd /etc/pam.d/system-auth-ac || authconfig --updateall --nostart >/dev/null 2>&1 || :
                        fi
+
+                       /usr/bin/systemctl enable \
+                               getty@.service \
+                               remote-fs.target \
+                               systemd-readahead-replay.service \
+                               systemd-readahead-collect.service \
+                               >/dev/null 2>&1 || :
+               end
+
+               script preup
+                       # Be sure to stop the old udev before updating.
+                       /usr/bin/systemctl stop udev.service udev-trigger.service \
+                               udev-control.socket udev-kernel.socket >/dev/null 2>&1 || :
                end
 
                script postup
                        # Restart login service after update
+                       /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
                        /usr/bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
+
+                       # Use the new journald configuration file and restart the service.
+                       if ! grep -xq ImportKernel=yes /etc/systemd/journald.conf ; then
+                               mv /etc/systemd/journald.conf.paknew /etc/systemd/journald.conf
+                               /usr/bin/systemctl restart systemd-journald.service >/dev/null 2>&1 || :
+                       fi
+               end
+
+               # Be sure to start the new udev after everything is done.
+               script posttransup
+                       /usr/bin/systemctl start systemd-udev.service  >/dev/null 2>&1 || :
                end
        end
 
@@ -197,12 +264,57 @@ packages
                end
        end
 
+       package %{name}-libs
+               template LIBS
+       end
+
        package %{name}-devel
                template DEVEL
 
                files += %{prefix}/lib/pakfire/macros/
        end
 
+       package libudev
+               summary = Libraries for adding libudev support to applications.
+               description
+                       This package contains the libraries that make it easier to use libudev
+                       functionality from applications.
+               end
+               license = LGPLv2+
+
+               conflicts
+                       filesystem < 002
+               end
+
+               files
+                       %{libdir}/lib*udev*.so.*
+                       %{libidr}/girepository*/
+               end
+       end
+
+       package libudev-devel
+               summary = Header files for adding libudev support to applications.
+               description
+                       This package contains the header and pkg-config files for developing
+                       applications using libudev functionality.
+               end
+               license = LGPLv2+
+
+               conflicts
+                       filesystem < 002
+               end
+
+               files
+                       %{libdir}/lib*udev*.so
+                       %{libdir}/pkgconfig/lib*udev.pc
+                       %{libdir}/pkgconfig/gudev*
+                       %{includedir}/lib*udev.h
+                       %{includedir}/gudev*
+                       %{datadir}/gir-*
+                       %{datadir}/gtk-doc/html/gudev
+               end
+       end
+
        package %{name}-debuginfo
                template DEBUGINFO
        end