]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/blobdiff - systemd/systemd.nm
flex: Update to 2.6.4
[people/pmueller/ipfire-3.x.git] / systemd / systemd.nm
index a6dacb37c1913ddbd48f99282b24f5ba75a8eb82..368ecdf0efc35d12e47c2ea902a7e8c0afdb013f 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = systemd
-version    = 194
+version    = 239
 release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
@@ -18,49 +18,107 @@ description
        SysV and LSB init scripts.
 end
 
-source_dl  = http://cgit.freedesktop.org/systemd/systemd/snapshot/
+source_dl  = https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/
 
 build
        unitdir = %{prefix}/lib/systemd/system
 
+       # The tools which are shipped by systemd requires an rpath to
+       # the libsystemd-shared binary to run properly. So the macro for
+       # removing any rpath's have to be disabled.
+       MACRO_FIX_LIBTOOL = # Do nothing
+
        requires
-               audit-devel
-               automake
-               autoconf
+               # Testsuite
+               /usr/bin/getfacl
+               /usr/bin/mount
+               /usr/bin/tree
+               /usr/bin/umount
+
+               attr-devel
                cryptsetup-luks-devel >= 1.4.2
                dbus-devel
                docbook-utils
                docbook-xsl
+               elfutils-devel
                gettext-devel
                glib2-devel
                gobject-introspection-devel >= 1.31
                gperf
                hwdata
-               intltool
-               kmod-devel >= 5
+               intltool >= 0.51.0
+               kmod-devel >= 15
                libacl-devel
                libblkid-devel
                libcap-devel
                libgcrypt-devel
-               libselinux-devel
-               libtool
+               libmount-devel
                libuuid-devel
+               m4
+               meson
+               ninja >= 1.5
                pam-devel
                pciutils-devel
+               python3-devel
+               python3-lxml
                usbutils
                vala
                xz-devel
+               zlib-devel
        end
 
-       configure_options += \
-               --with-distro=ipfire \
-               --disable-static
+       export LD_LIBRARY_PATH = %{DIR_APP}/.libs
+
+       configure_options = \
+               -Dsysvinit-path= \
+               -Dsysvrcnd-path= \
+               -Dzlib=true \
+               -Dsmack=false \
+               -Dbacklight=false \
+               -Dfirstboot=false \
+               -Dhibernate=false \
+               -Dimportd=false \
+               -Dlibiptc=false \
+               -Dmachined=false \
+               -Dnetworkd=false \
+               -Dresolve=false \
+               -Dportabled=false \
+               -Dsysusers=false \
+               -Dtimesyncd=false \
+               -Dtimedated=false \
+               -Dpolkit=false \
+               -Dstatic=false
 
        prepare_cmds
-               ./autogen.sh ac
+               %{create_groups}
+       end
+
+       build
+               # Call meson and pass configure options.
+               meson --buildtype=plain %{configure_options} . build
+
+               # Call ninja to start build
+               ninja -v %{PARALLELISMFLAGS} -C build
+       end
+
+       test
+               # 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
 
-       install_cmds
+       install
+               # Export destdir.
+               export DESTDIR=%{BUILDROOT}
+
+               # Call ninja to perform installation
+               ninja install -v %{PARALLELISMFLAGS} -C build
+
                # Create folder in log to store the journal.
                mkdir -pv %{BUILDROOT}/var/log/journal
 
@@ -100,15 +158,28 @@ build
 
                # Replace absolute symlinks by relative ones.
                cd %{BUILDROOT}%{unitdir}/../user
-               for i in bluetooth local-fs printer remote-fs shutdown sockets sound swap; do
+               for i in bluetooth local-fs paths printer remote-fs shutdown smartcard sockets sound swap timers; do
                        ln -svf ../system/${i}.target ${i}.target || exit 1
                done
 
+               # Remove .so file for the shared library, it's not supposed to be used for anything.
+               rm -rvf %{BUILDROOT}%{prefix}/lib/systemd/libsystemd-shared.so
+
                # Remove tmpfile for X11
                rm -rfv %{BUILDROOT}/usr/lib/tmpfiles.d/x11.conf
 
-               # Remove unneeded symlink for xdg
-               rm -rfv %{BUILDROOT}/etc/xdg/systemd
+               # Drop X11 related config files
+               rm -rvf %{BUILDROOT}%{sysconfdir}/X11
+
+               # Remove unneeded stuff for xdg
+               rm -rfv %{BUILDROOT}/etc/xdg
+
+               # Remove unneeded stuff for rpm.
+               rm -rvf %{BUILDROOT}/etc/rpm
+               rm -rvf %{BUILDROOT}/usr/lib/rpm
+
+               # Drop ZSH related files
+               rm -rvf %{BUILDROOT}%{datadir}/zsh
 
                # Use journald. Enable the import of kernel messages.
                # Stop forwarding to a syslog daemon.
@@ -116,6 +187,45 @@ build
                        -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/
+
+               # 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
+
+               # Don't let udev set up any networking
+               rm -vf %{BUILDROOT}/usr/lib/udev/rules.d/80-net-setup-link.rules
+
+               # Create journald related folders.
+               mkdir -pv %{BUILDROOT}/run/log/journal
+               chown root:systemd-journal %{BUILDROOT}/run/log/journal
+
+               mkdir -pv %{BUILDROOT}/var/log/journal
+               chown root:systemd-journal %{BUILDROOT}/var/log/journal
+
+               # Create empty environment file.
+               touch %{BUILDROOT}%{sysconfdir}/environment
+       end
+end
+
+create_groups
+       # 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 || :
+       getent group input >/dev/null || groupadd -r input || :
+       getent group utmp >/dev/null || groupadd -r -g 22 utmp || :
+
+       # Create group for journald.
+       getent group systemd-journal >/dev/null || /usr/sbin/groupadd -r systemd-journal
+end
+
+quality-agent
+       whitelist_rpath
+               %{prefix}/lib/systemd
        end
 end
 
@@ -130,6 +240,8 @@ packages
                        hwdata
                        python-cairo
                        python-dbus
+                       python-gobject3
+                       %{name}-libs=%{thisver}
                        %{name}-units=%{thisver}
                        util-linux>=2.19
                end
@@ -147,6 +259,7 @@ packages
                end
 
                conflicts
+                       bash-completion < 2.1
                        dracut < 019
                        filesystem < 002
                        rsyslog < 5.8.6-4
@@ -169,17 +282,10 @@ packages
                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 || :
+                       %{create_groups}
                end
 
                script postin
-                       # Generate Machine ID.
-                       /usr/bin/systemd-machine-id-setup > /dev/null 2>&1 || :
-
                        # Reexec systemd daemon.
                        /usr/bin/systemctl daemon-reexec > /dev/null 2>&1 || :
 
@@ -193,6 +299,7 @@ packages
 
                        /usr/bin/systemctl enable \
                                getty@.service \
+                               serial-getty@.service \
                                remote-fs.target \
                                systemd-readahead-replay.service \
                                systemd-readahead-collect.service \
@@ -203,9 +310,14 @@ packages
                        # 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 || :
+
+                       %{create_groups}
                end
 
                script postup
+                       # Re-exec systemd after update.
+                       /usr/bin/systemctl daemon-reexec
+
                        # 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 || :
@@ -215,6 +327,9 @@ packages
                                mv /etc/systemd/journald.conf.paknew /etc/systemd/journald.conf
                                /usr/bin/systemctl restart systemd-journald.service >/dev/null 2>&1 || :
                        fi
+
+                       # Enable spawning getty's on serial devices.
+                       systemctl enable serial-getty@.service >/dev/null 2>&1 || :
                end
 
                # Be sure to start the new udev after everything is done.
@@ -260,6 +375,52 @@ packages
                end
        end
 
+       package %{name}-libs
+               template LIBS
+       
+               groups += Base
+
+               prerequires
+                       /etc/nsswitch.conf
+               end
+
+               provides
+                       nss-myhostname = %{thisver}
+               end
+
+               obsoletes
+                       nss-myhostname <= 0.3-3
+                       systemd-compat-libs < 230
+               end
+
+               conflicts
+                       # Ensure that the version of systemd matches systemd-libs.
+                       systemd > %{thisver}
+                       systemd < %{thisver}
+               end
+
+               # Add myhostname to the hosts line of /etc/nsswitch.conf
+               script postin
+                       if [ -f "/etc/nsswitch.conf" ]; then
+                               sed -i.bak -e '
+                                       /^hosts:/ !b
+                                       /\<myhostname\>/ b
+                                       s/[[:blank:]]*$/ myhostname/
+                                       ' /etc/nsswitch.conf
+                       fi
+               end
+
+               # Remove myhostname from the hosts line of /etc/nsswitch.conf
+               script postun
+                       if [ -f "/etc/nsswitch.conf" ]; then
+                               sed -i.bak -e '
+                                       /^hosts:/ !b
+                                       s/[[:blank:]]\+myhostname\>//
+                                       ' /etc/nsswitch.conf
+                       fi
+               end
+       end
+
        package %{name}-devel
                template DEVEL
 
@@ -279,7 +440,7 @@ packages
                end
 
                files
-                       %{libdir}/libgudev*.so.*
+                       %{libdir}/lib*udev*.so.*
                        %{libidr}/girepository*/
                end
        end