units: add default units for system.slice, user.slice, machine.slice

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4c5e6fcdf1365b8dc991e117f1fe4fe44f4044d6..f84236d8a08c850240f5ade7691708da74fa1b1f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -222,6 +222,7 @@ install-target-wants-hook:
        what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
        what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
        what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
        what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
        what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
        what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)

+       what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants)

 
 define add-wants
        [ -z "$$what" ] || ( \
 
 define add-wants
        [ -z "$$what" ] || ( \


@@ -280,7 +281,6 @@ rootbin_PROGRAMS = \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \

-       systemd-tmpfiles \

        systemd-machine-id-setup
 
 bin_PROGRAMS = \
        systemd-machine-id-setup
 
 bin_PROGRAMS = \


@@ -336,19 +336,9 @@ dist_bashcompletion_DATA = \
        shell-completion/bash/systemd-analyze \
        shell-completion/bash/udevadm
 
        shell-completion/bash/systemd-analyze \
        shell-completion/bash/udevadm
 

-dist_tmpfiles_DATA = \
-       tmpfiles.d/systemd.conf \
-       tmpfiles.d/tmp.conf \
-       tmpfiles.d/x11.conf
-

 dist_sysctl_DATA = \
        sysctl.d/50-default.conf
 
 dist_sysctl_DATA = \
        sysctl.d/50-default.conf
 

-if HAVE_SYSV_COMPAT
-dist_tmpfiles_DATA += \
-       tmpfiles.d/legacy.conf
-endif
-

 dist_systemunit_DATA = \
        units/graphical.target \
        units/multi-user.target \
 dist_systemunit_DATA = \
        units/graphical.target \
        units/multi-user.target \


@@ -387,6 +377,10 @@ dist_systemunit_DATA = \
        units/paths.target \
        units/suspend.target \
        units/swap.target \
        units/paths.target \
        units/suspend.target \
        units/swap.target \

+       units/slices.target \
+       units/system.slice \
+       units/user.slice \
+       units/machine.slice \

        units/systemd-initctl.socket \
        units/systemd-shutdownd.socket \
        units/syslog.socket \
        units/systemd-initctl.socket \
        units/systemd-shutdownd.socket \
        units/syslog.socket \


@@ -400,8 +394,6 @@ dist_systemunit_DATA = \
        units/sound.target \
        units/bluetooth.target \
        units/smartcard.target \
        units/sound.target \
        units/bluetooth.target \
        units/smartcard.target \

-       units/systemd-tmpfiles-clean.timer \
-       units/quotaon.service \

        units/systemd-ask-password-wall.path \
        units/systemd-ask-password-console.path \
        units/systemd-udevd-control.socket \
        units/systemd-ask-password-wall.path \
        units/systemd-ask-password-console.path \
        units/systemd-udevd-control.socket \


@@ -419,9 +411,6 @@ nodist_systemunit_DATA = \
        units/systemd-remount-fs.service \
        units/systemd-update-utmp.service \
        units/systemd-update-utmp-runlevel.service \
        units/systemd-remount-fs.service \
        units/systemd-update-utmp.service \
        units/systemd-update-utmp-runlevel.service \

-       units/systemd-tmpfiles-setup-dev.service \
-       units/systemd-tmpfiles-setup.service \
-       units/systemd-tmpfiles-clean.service \

        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \
        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \


@@ -465,9 +454,6 @@ EXTRA_DIST += \
        units/systemd-remount-fs.service.in \
        units/systemd-update-utmp.service.in \
        units/systemd-update-utmp-runlevel.service.in \
        units/systemd-remount-fs.service.in \
        units/systemd-update-utmp.service.in \
        units/systemd-update-utmp-runlevel.service.in \

-       units/systemd-tmpfiles-setup-dev.service.in \
-       units/systemd-tmpfiles-setup.service.in \
-       units/systemd-tmpfiles-clean.service.in \

        units/systemd-ask-password-wall.service.in \
        units/systemd-ask-password-console.service.in \
        units/systemd-sysctl.service.in \
        units/systemd-ask-password-wall.service.in \
        units/systemd-ask-password-console.service.in \
        units/systemd-sysctl.service.in \


@@ -530,6 +516,9 @@ MANPAGES_ALIAS =
 
 include Makefile-man.am
 
 
 include Makefile-man.am
 

+.PHONY: man
+man: $(MANPAGES) $(MANPAGES_ALIAS) $(HTML_FILES) $(HTML_ALIAS)
+

 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
 HTML_FILES = \
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
 HTML_FILES = \


@@ -695,7 +684,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/fileio.h \
        src/shared/output-mode.h \
        src/shared/MurmurHash3.c \
        src/shared/fileio.h \
        src/shared/output-mode.h \
        src/shared/MurmurHash3.c \

-       src/shared/MurmurHash3.h
+       src/shared/MurmurHash3.h \
+       src/shared/refcnt.h

 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \


@@ -858,6 +848,8 @@ libsystemd_core_la_SOURCES = \
        src/core/timer.h \
        src/core/path.c \
        src/core/path.h \
        src/core/timer.h \
        src/core/path.c \
        src/core/path.h \

+       src/core/slice.c \
+       src/core/slice.h \

        src/core/load-dropin.c \
        src/core/load-dropin.h \
        src/core/execute.c \
        src/core/load-dropin.c \
        src/core/load-dropin.h \
        src/core/execute.c \


@@ -896,6 +888,8 @@ libsystemd_core_la_SOURCES = \
        src/core/dbus-kill.h \
        src/core/dbus-path.c \
        src/core/dbus-path.h \
        src/core/dbus-kill.h \
        src/core/dbus-path.c \
        src/core/dbus-path.h \

+       src/core/dbus-slice.c \
+       src/core/dbus-slice.h \

        src/core/cgroup.c \
        src/core/cgroup.h \
        src/core/selinux-access.c \
        src/core/cgroup.c \
        src/core/cgroup.h \
        src/core/selinux-access.c \


@@ -1436,6 +1430,7 @@ EXTRA_DIST += \
        units/systemd-modules-load.service.in
 
 # ------------------------------------------------------------------------------
        units/systemd-modules-load.service.in
 
 # ------------------------------------------------------------------------------

+if ENABLE_TMPFILES

 systemd_tmpfiles_SOURCES = \
        src/tmpfiles/tmpfiles.c
 
 systemd_tmpfiles_SOURCES = \
        src/tmpfiles/tmpfiles.c
 


@@ -1444,6 +1439,44 @@ systemd_tmpfiles_LDADD = \
        libsystemd-shared.la \
        libsystemd-capability.la
 
        libsystemd-shared.la \
        libsystemd-capability.la
 

+rootbin_PROGRAMS += \
+       systemd-tmpfiles
+
+dist_systemunit_DATA += \
+       units/systemd-tmpfiles-clean.timer
+
+nodist_systemunit_DATA += \
+       units/systemd-tmpfiles-setup-dev.service \
+       units/systemd-tmpfiles-setup.service \
+       units/systemd-tmpfiles-clean.service
+
+dist_tmpfiles_DATA = \
+       tmpfiles.d/systemd.conf \
+       tmpfiles.d/tmp.conf \
+       tmpfiles.d/x11.conf
+
+if HAVE_SYSV_COMPAT
+dist_tmpfiles_DATA += \
+       tmpfiles.d/legacy.conf
+endif
+
+SYSINIT_TARGET_WANTS += \
+       systemd-tmpfiles-setup-dev.service \
+       systemd-tmpfiles-setup.service
+
+TIMERS_TARGET_WANTS += \
+       systemd-tmpfiles-clean.timer
+
+INSTALL_DIRS += \
+       $(tmpfilesdir) \
+       $(sysconfdir)/tmpfiles.d
+endif
+
+EXTRA_DIST += \
+       units/systemd-tmpfiles-setup-dev.service.in \
+       units/systemd-tmpfiles-setup.service.in \
+       units/systemd-tmpfiles-clean.service.in
+

 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
        src/machine-id-setup/machine-id-setup-main.c \
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
        src/machine-id-setup/machine-id-setup-main.c \


@@ -1542,8 +1575,8 @@ systemd_system_update_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
        libsystemd-label.la \
        libsystemd-shared.la
 

-# ------------------------------------------------------------------------------

 if ENABLE_EFI
 if ENABLE_EFI

+# ------------------------------------------------------------------------------

 systemgenerator_PROGRAMS +=  \
        systemd-efi-boot-generator
 
 systemgenerator_PROGRAMS +=  \
        systemd-efi-boot-generator
 


@@ -1553,6 +1586,22 @@ systemd_efi_boot_generator_SOURCES = \
 systemd_efi_boot_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 systemd_efi_boot_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la

+
+# ------------------------------------------------------------------------------
+bootctl_SOURCES = \
+       src/boot/boot.h \
+       src/boot/boot-loader.h \
+       src/boot/bootctl.c \
+       src/boot/boot-loader.c \
+       src/boot/boot-efi.c
+
+bootctl_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-id128.la \
+       libsystemd-daemon.la
+
+bin_PROGRAMS += \
+       bootctl

 endif
 
 # ------------------------------------------------------------------------------
 endif
 
 # ------------------------------------------------------------------------------


@@ -1748,6 +1797,10 @@ libsystemd_bus_la_LIBADD =  \
        libsystemd-shared.la \
        libsystemd-daemon.la
 
        libsystemd-shared.la \
        libsystemd-daemon.la
 

+libsystemd_bus_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -pthread
+

 noinst_LTLIBRARIES += \
        libsystemd-bus.la
 
 noinst_LTLIBRARIES += \
        libsystemd-bus.la
 


@@ -1758,6 +1811,8 @@ tests += \
        test-bus-server \
        test-bus-match \
        test-bus-kernel \
        test-bus-server \
        test-bus-match \
        test-bus-kernel \

+       test-bus-kernel-bloom \
+       test-bus-kernel-benchmark \

        test-bus-memfd \
        test-bus-zero-copy
 
        test-bus-memfd \
        test-bus-zero-copy
 


@@ -1831,6 +1886,28 @@ test_bus_kernel_LDADD = \
        libsystemd-bus.la \
        libsystemd-id128-internal.la
 
        libsystemd-bus.la \
        libsystemd-id128-internal.la
 

+test_bus_kernel_bloom_SOURCES = \
+       src/libsystemd-bus/test-bus-kernel-bloom.c
+
+test_bus_kernel_bloom_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_kernel_bloom_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+
+test_bus_kernel_benchmark_SOURCES = \
+       src/libsystemd-bus/test-bus-kernel-benchmark.c
+
+test_bus_kernel_benchmark_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_bus_kernel_benchmark_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la \
+       libsystemd-id128-internal.la
+

 test_bus_memfd_SOURCES = \
        src/libsystemd-bus/test-bus-memfd.c
 
 test_bus_memfd_SOURCES = \
        src/libsystemd-bus/test-bus-memfd.c
 


@@ -2476,6 +2553,7 @@ dist_udevkeymap_DATA = \
        keymaps/lenovo-thinkpad_x6_tablet \
        keymaps/lenovo-thinkpad_x200_tablet \
        keymaps/lg-x110 \
        keymaps/lenovo-thinkpad_x6_tablet \
        keymaps/lenovo-thinkpad_x200_tablet \
        keymaps/lg-x110 \

+       keymaps/logitech-usb \

        keymaps/logitech-wave \
        keymaps/logitech-wave-cordless \
        keymaps/logitech-wave-pro-cordless \
        keymaps/logitech-wave \
        keymaps/logitech-wave-cordless \
        keymaps/logitech-wave-pro-cordless \


@@ -2714,6 +2792,14 @@ test_journal_verify_LDADD = \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la
 
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la
 

+test_journal_interleaving_SOURCES = \
+       src/journal/test-journal-interleaving.c
+
+test_journal_interleaving_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la
+

 test_mmap_cache_SOURCES = \
        src/journal/test-mmap-cache.c
 
 test_mmap_cache_SOURCES = \
        src/journal/test-mmap-cache.c
 


@@ -2889,6 +2975,7 @@ tests += \
        test-journal-match \
        test-journal-stream \
        test-journal-verify \
        test-journal-match \
        test-journal-stream \
        test-journal-verify \

+       test-journal-interleaving \

        test-mmap-cache \
        test-catalog
 
        test-mmap-cache \
        test-catalog
 


@@ -3427,24 +3514,6 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
        units/systemd-timedated.service.in
 
 EXTRA_DIST += \
        units/systemd-timedated.service.in
 

-# ------------------------------------------------------------------------------
-if ENABLE_EFI
-bootctl_SOURCES = \
-       src/boot/boot.h \
-       src/boot/boot-loader.h \
-       src/boot/bootctl.c \
-       src/boot/boot-loader.c \
-       src/boot/boot-efi.c
-
-bootctl_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-id128.la \
-       libsystemd-daemon.la
-
-bin_PROGRAMS += \
-       bootctl
-endif
-

 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
 libnss_myhostname_la_SOURCES = \
 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
 libnss_myhostname_la_SOURCES = \


@@ -4085,12 +4154,8 @@ SYSINIT_TARGET_WANTS += \
        sys-kernel-config.mount \
        sys-kernel-debug.mount \
        sys-fs-fuse-connections.mount \
        sys-kernel-config.mount \
        sys-kernel-debug.mount \
        sys-fs-fuse-connections.mount \

-       systemd-tmpfiles-setup-dev.service \
-       systemd-tmpfiles-setup.service \

        systemd-sysctl.service \
        systemd-ask-password-console.path
        systemd-sysctl.service \
        systemd-ask-password-console.path

-TIMERS_TARGET_WANTS += \
-       systemd-tmpfiles-clean.timer

 
 if HAVE_SYSV_COMPAT
 SYSTEM_UNIT_ALIASES += \
 
 if HAVE_SYSV_COMPAT
 SYSTEM_UNIT_ALIASES += \


@@ -4121,6 +4186,8 @@ USER_UNIT_ALIASES += \
 GENERAL_ALIASES += \
        $(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
        $(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \
 GENERAL_ALIASES += \
        $(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
        $(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \

+       $(systemunitdir)/machine.slice $(pkgsysconfdir)/system/slices.target.wants/machine.slice \
+       $(systemunitdir)/user.slice $(pkgsysconfdir)/system/slices.target.wants/user.slice \

        $(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
        ../system-services/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service
 
        $(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
        ../system-services/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service
 


@@ -4134,8 +4201,6 @@ INSTALL_DIRS += \
 endif
 
 INSTALL_DIRS += \
 endif
 
 INSTALL_DIRS += \

-       $(tmpfilesdir) \
-       $(sysconfdir)/tmpfiles.d \

        $(prefix)/lib/modules-load.d \
        $(sysconfdir)/modules-load.d \
        $(prefix)/lib/sysctl.d \
        $(prefix)/lib/modules-load.d \
        $(sysconfdir)/modules-load.d \
        $(prefix)/lib/sysctl.d \