]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
Merge pull request #2760 from ronnychevalier/rc/core_no_new_privileges_seccompv3
[thirdparty/systemd.git] / Makefile.am
index da94b502a37a42dc30f28b009308ff9ab4b9062b..c2a82a5a35e7a14f02951c35e2e0c8f23b41366b 100644 (file)
@@ -131,8 +131,12 @@ TEST_EXTENSIONS = .py
 PY_LOG_COMPILER = $(PYTHON)
 DISABLE_HARD_ERRORS = yes
 if ENABLE_TESTS
-noinst_PROGRAMS = $(manual_tests) $(tests)
+noinst_PROGRAMS = $(manual_tests) $(tests) $(unsafe_tests)
 TESTS = $(tests)
+if ENABLE_UNSAFE_TESTS
+TESTS += \
+       $(unsafe_tests)
+endif
 else
 noinst_PROGRAMS =
 TESTS =
@@ -393,7 +397,6 @@ rootlibexec_PROGRAMS = \
        systemd-ac-power \
        systemd-sysctl \
        systemd-sleep \
-       systemd-bus-proxyd \
        systemd-socket-proxyd \
        systemd-update-done
 
@@ -741,6 +744,7 @@ noinst_LTLIBRARIES += \
 
 libbasic_la_SOURCES = \
        src/basic/missing.h \
+       src/basic/missing_syscall.h \
        src/basic/capability-util.c \
        src/basic/capability-util.h \
        src/basic/c-rbtree.c \
@@ -851,6 +855,8 @@ libbasic_la_SOURCES = \
        src/basic/exit-status.h \
        src/basic/virt.c \
        src/basic/virt.h \
+       src/basic/architecture.c \
+       src/basic/architecture.h \
        src/basic/smack-util.c \
        src/basic/smack-util.h \
        src/basic/device-nodes.c \
@@ -964,8 +970,6 @@ libshared_la_SOURCES = \
        src/shared/initreq.h \
        src/shared/dns-domain.c \
        src/shared/dns-domain.h \
-       src/shared/architecture.c \
-       src/shared/architecture.h \
        src/shared/efivars.c \
        src/shared/efivars.h \
        src/shared/fstab-util.c \
@@ -1388,19 +1392,17 @@ EXTRA_DIST += \
 
 manual_tests += \
        test-ns \
-       test-loopback \
-       test-hostname \
-       test-daemon \
        test-cgroup \
        test-install \
-       test-watchdog \
-       test-log \
-       test-ipcrm \
        test-btrfs \
        test-acd \
        test-ipv4ll-manual \
        test-ask-password-api
 
+unsafe_tests = \
+       test-hostname \
+       test-ipcrm
+
 if HAVE_LIBIPTC
 manual_tests += \
        test-firewall-util
@@ -1412,7 +1414,11 @@ manual_tests += \
 endif
 
 tests += \
+       test-daemon \
+       test-log \
+       test-loopback \
        test-engine \
+       test-watchdog \
        test-cgroup-mask \
        test-job-type \
        test-env-replace \
@@ -1427,6 +1433,18 @@ tests += \
        test-utf8 \
        test-ellipsize \
        test-util \
+       test-cpu-set-util \
+       test-hexdecoct \
+       test-escape \
+       test-alloc-util \
+       test-proc-cmdline \
+       test-io-util \
+       test-glob-util \
+       test-xattr-util \
+       test-fs-util \
+       test-web-util \
+       test-stat-util \
+       test-fd-util \
        test-string-util \
        test-extract-word \
        test-parse-util \
@@ -1449,6 +1467,7 @@ tests += \
        test-prioq \
        test-fileio \
        test-time \
+       test-clock \
        test-hashmap \
        test-set \
        test-bitmap \
@@ -1467,7 +1486,6 @@ tests += \
        test-ratelimit \
        test-condition \
        test-uid-range \
-       test-bus-policy \
        test-locale-util \
        test-execute \
        test-copy \
@@ -1478,11 +1496,11 @@ tests += \
        test-af-list \
        test-arphrd-list \
        test-dns-domain \
-       test-dns-packet \
-       test-resolve-tables \
        test-install-root \
        test-rlimit-util \
-       test-signal-util
+       test-signal-util \
+       test-selinux \
+       test-sizeof
 
 if HAVE_ACL
 tests += \
@@ -1545,6 +1563,7 @@ EXTRA_DIST += \
        test/test-execute/exec-passenvironment-repeated.service \
        test/test-execute/exec-passenvironment.service \
        test/test-execute/exec-group.service \
+       test/test-execute/exec-group-nfsnobody.service \
        test/test-execute/exec-ignoresigpipe-no.service \
        test/test-execute/exec-ignoresigpipe-yes.service \
        test/test-execute/exec-personality-x86-64.service \
@@ -1554,12 +1573,16 @@ EXTRA_DIST += \
        test/test-execute/exec-privatedevices-yes.service \
        test/test-execute/exec-privatetmp-no.service \
        test/test-execute/exec-privatetmp-yes.service \
+       test/test-execute/exec-spec-interpolation.service \
        test/test-execute/exec-systemcallerrornumber.service \
        test/test-execute/exec-systemcallfilter-failing2.service \
        test/test-execute/exec-systemcallfilter-failing.service \
        test/test-execute/exec-systemcallfilter-not-failing2.service \
        test/test-execute/exec-systemcallfilter-not-failing.service \
+       test/test-execute/exec-systemcallfilter-system-user.service \
+       test/test-execute/exec-systemcallfilter-system-user-nfsnobody.service \
        test/test-execute/exec-user.service \
+       test/test-execute/exec-user-nfsnobody.service \
        test/test-execute/exec-workingdirectory.service \
        test/test-execute/exec-umask-0177.service \
        test/test-execute/exec-umask-default.service \
@@ -1575,6 +1598,14 @@ EXTRA_DIST += \
        test/test-execute/exec-capabilityboundingset-merge.service \
        test/test-execute/exec-capabilityboundingset-reset.service \
        test/test-execute/exec-capabilityboundingset-simple.service \
+       test/test-execute/exec-capabilityambientset.service \
+       test/test-execute/exec-capabilityambientset-nfsnobody.service \
+       test/test-execute/exec-capabilityambientset-merge.service \
+       test/test-execute/exec-capabilityambientset-merge-nfsnobody.service \
+       test/test-execute/exec-runtimedirectory.service \
+       test/test-execute/exec-runtimedirectory-mode.service \
+       test/test-execute/exec-runtimedirectory-owner.service \
+       test/test-execute/exec-runtimedirectory-owner-nfsnobody.service \
        test/bus-policy/hello.conf \
        test/bus-policy/methods.conf \
        test/bus-policy/ownerships.conf \
@@ -1646,13 +1677,13 @@ test_dns_domain_LDADD = \
 
 
 if ENABLE_EFI
-manual_tests += \
-       test-boot-timestamp
+tests += \
+       test-boot-timestamps
 
-test_boot_timestamp_SOURCES = \
+test_boot_timestamps_SOURCES = \
        src/test/test-boot-timestamps.c
 
-test_boot_timestamp_LDADD = \
+test_boot_timestamps_LDADD = \
        libshared.la
 endif
 
@@ -1750,6 +1781,78 @@ test_util_SOURCES = \
 test_util_LDADD = \
        libshared.la
 
+test_hexdecoct_SOURCES = \
+       src/test/test-hexdecoct.c
+
+test_hexdecoct_LDADD = \
+       libbasic.la
+
+test_alloc_util_SOURCES = \
+       src/test/test-alloc-util.c
+
+test_alloc_util_LDADD = \
+       libbasic.la
+
+test_xattr_util_SOURCES = \
+       src/test/test-xattr-util.c
+
+test_xattr_util_LDADD = \
+       libbasic.la
+
+test_io_util_SOURCES = \
+       src/test/test-io-util.c
+
+test_io_util_LDADD = \
+       libbasic.la
+
+test_glob_util_SOURCES = \
+       src/test/test-glob-util.c
+
+test_glob_util_LDADD = \
+       libbasic.la
+
+test_fs_util_SOURCES = \
+       src/test/test-fs-util.c
+
+test_fs_util_LDADD = \
+       libbasic.la
+
+test_proc_cmdline_SOURCES = \
+       src/test/test-proc-cmdline.c
+
+test_proc_cmdline_LDADD = \
+       libbasic.la
+
+test_fd_util_SOURCES = \
+       src/test/test-fd-util.c
+
+test_fd_util_LDADD = \
+       libbasic.la
+
+test_web_util_SOURCES = \
+       src/test/test-web-util.c
+
+test_web_util_LDADD = \
+       libbasic.la
+
+test_cpu_set_util_SOURCES = \
+       src/test/test-cpu-set-util.c
+
+test_cpu_set_util_LDADD = \
+       libbasic.la
+
+test_stat_util_SOURCES = \
+       src/test/test-stat-util.c
+
+test_stat_util_LDADD = \
+       libbasic.la
+
+test_escape_SOURCES = \
+       src/test/test-escape.c
+
+test_escape_LDADD = \
+       libbasic.la
+
 test_string_util_SOURCES = \
        src/test/test-string-util.c
 
@@ -1870,6 +1973,18 @@ test_signal_util_SOURCES = \
 test_signal_util_LDADD = \
        libshared.la
 
+test_selinux_SOURCES = \
+       src/test/test-selinux.c
+
+test_selinux_LDADD = \
+       libshared.la
+
+test_sizeof_SOURCES = \
+       src/test/test-sizeof.c
+
+test_sizeof_LDADD = \
+       libshared.la
+
 BUILT_SOURCES += \
        src/test/test-hashmap-ordered.c
 
@@ -1925,14 +2040,11 @@ test_unaligned_SOURCES = \
 test_tables_SOURCES = \
        src/test/test-tables.c \
        src/shared/test-tables.h \
-       src/bus-proxyd/bus-xml-policy.c \
-       src/bus-proxyd/bus-xml-policy.h \
        src/journal/journald-server.c \
        src/journal/journald-server.h
 
 test_tables_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -I$(top_srcdir)/src/bus-proxyd
+       $(AM_CPPFLAGS)
 
 test_tables_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1962,6 +2074,12 @@ test_time_SOURCES = \
 test_time_LDADD = \
        libshared.la
 
+test_clock_SOURCES = \
+       src/test/test-clock.c
+
+test_clock_LDADD = \
+       libshared.la
+
 test_architecture_SOURCES = \
        src/test/test-architecture.c
 
@@ -2173,13 +2291,6 @@ test_conf_parser_SOURCES = \
 test_conf_parser_LDADD = \
        libshared.la
 
-test_bus_policy_SOURCES = \
-       src/bus-proxyd/test-bus-xml-policy.c
-
-test_bus_policy_LDADD = \
-       libbus-proxy-core.la \
-       libshared.la
-
 test_af_list_SOURCES = \
        src/test/test-af-list.c
 
@@ -2944,59 +3055,12 @@ systemd_run_LDADD = \
        libshared.la
 
 # ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-       libbus-proxy-core.la
-
-libbus_proxy_core_la_SOURCES = \
-       src/bus-proxyd/bus-xml-policy.c \
-       src/bus-proxyd/bus-xml-policy.h \
-       src/bus-proxyd/driver.c \
-       src/bus-proxyd/driver.h \
-       src/bus-proxyd/proxy.c \
-       src/bus-proxyd/proxy.h \
-       src/bus-proxyd/synthesize.c \
-       src/bus-proxyd/synthesize.h
-
-libbus_proxy_core_la_LIBADD = \
-       libshared.la
-
-systemd_bus_proxyd_SOURCES = \
-       src/bus-proxyd/bus-proxyd.c
-
-systemd_bus_proxyd_LDADD = \
-       libbus-proxy-core.la \
-       libshared.la
-
 systemd_stdio_bridge_SOURCES = \
-       src/bus-proxyd/stdio-bridge.c
+       src/stdio-bridge/stdio-bridge.c
 
 systemd_stdio_bridge_LDADD = \
-       libbus-proxy-core.la \
        libshared.la
 
-nodist_systemunit_DATA += \
-       units/systemd-bus-proxyd.service
-
-dist_systemunit_DATA += \
-       units/systemd-bus-proxyd.socket
-
-nodist_userunit_DATA += \
-       units/user/systemd-bus-proxyd.service
-
-dist_userunit_DATA += \
-       units/user/systemd-bus-proxyd.socket
-
-EXTRA_DIST += \
-       units/systemd-bus-proxyd.service.m4.in \
-       units/user/systemd-bus-proxyd.service.in
-
-if HAVE_SMACK
-bus-proxyd-set-cap-hook:
-       -$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd
-
-INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
-endif
-
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
        src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -3159,7 +3223,6 @@ tests += \
        test-bus-cleanup \
        test-bus-server \
        test-bus-match \
-       test-bus-proxy \
        test-bus-kernel \
        test-bus-kernel-bloom \
        test-bus-zero-copy \
@@ -3252,12 +3315,6 @@ test_bus_match_SOURCES = \
 test_bus_match_LDADD = \
        libshared.la
 
-test_bus_proxy_SOURCES = \
-       src/libsystemd/sd-bus/test-bus-proxy.c
-
-test_bus_proxy_LDADD = \
-       libshared.la
-
 test_bus_kernel_SOURCES = \
        src/libsystemd/sd-bus/test-bus-kernel.c
 
@@ -3367,14 +3424,11 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/dhcp-identifier.h \
        src/libsystemd-network/dhcp-identifier.c \
        src/libsystemd-network/lldp.h \
-       src/libsystemd-network/lldp-tlv.h \
-       src/libsystemd-network/lldp-tlv.c \
+       src/libsystemd-network/lldp-internal.h \
        src/libsystemd-network/lldp-network.h \
        src/libsystemd-network/lldp-network.c \
-       src/libsystemd-network/lldp-port.h \
-       src/libsystemd-network/lldp-port.c \
-       src/libsystemd-network/lldp-internal.h \
-       src/libsystemd-network/lldp-internal.c \
+       src/libsystemd-network/lldp-neighbor.h \
+       src/libsystemd-network/lldp-neighbor.c \
        src/libsystemd-network/sd-lldp.c
 
 libsystemd_network_la_LIBADD = \
@@ -3457,9 +3511,6 @@ test_dhcp6_client_LDADD = \
        libshared.la
 
 test_lldp_SOURCES = \
-       src/libsystemd-network/lldp.h \
-       src/libsystemd-network/lldp-tlv.h \
-       src/libsystemd-network/lldp-tlv.c \
        src/libsystemd-network/test-lldp.c
 
 test_lldp_LDADD = \
@@ -3750,8 +3801,10 @@ endif
 endif
 endif
 
+tests += \
+       test-libudev
+
 manual_tests += \
-       test-libudev \
        test-udev
 
 test_libudev_SOURCES = \
@@ -3899,6 +3952,34 @@ systemd_cat_SOURCES = \
 systemd_cat_LDADD = \
        libjournal-core.la
 
+if HAVE_LIBCURL
+rootlibexec_PROGRAMS += \
+        systemd-journal-upload
+
+systemd_journal_upload_SOURCES = \
+        src/journal-remote/journal-upload.h \
+        src/journal-remote/journal-upload.c \
+        src/journal-remote/journal-upload-journal.c
+
+systemd_journal_upload_CFLAGS = \
+        $(AM_CFLAGS) \
+        $(LIBCURL_CFLAGS)
+
+systemd_journal_upload_LDADD = \
+        libshared.la \
+        $(LIBCURL_LIBS)
+
+nodist_systemunit_DATA += \
+        units/systemd-journal-upload.service
+
+nodist_pkgsysconf_DATA += \
+        src/journal-remote/journal-upload.conf
+endif
+
+EXTRA_DIST += \
+        units/systemd-journal-upload.service.in \
+        src/journal-remote/journal-upload.conf.in
+
 if HAVE_MICROHTTPD
 rootlibexec_PROGRAMS += \
        systemd-journal-remote
@@ -3958,34 +4039,6 @@ EXTRA_DIST += \
        src/journal-remote/log-generator.py
 endif
 
-if HAVE_LIBCURL
-rootlibexec_PROGRAMS += \
-       systemd-journal-upload
-
-systemd_journal_upload_SOURCES = \
-       src/journal-remote/journal-upload.h \
-       src/journal-remote/journal-upload.c \
-       src/journal-remote/journal-upload-journal.c
-
-systemd_journal_upload_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(LIBCURL_CFLAGS)
-
-systemd_journal_upload_LDADD = \
-       libshared.la \
-       $(LIBCURL_LIBS)
-
-nodist_systemunit_DATA += \
-       units/systemd-journal-upload.service
-
-nodist_pkgsysconf_DATA += \
-       src/journal-remote/journal-upload.conf
-endif
-
-EXTRA_DIST += \
-       units/systemd-journal-upload.service.in \
-       src/journal-remote/journal-upload.conf.in
-
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
        $(AM_CFLAGS)
@@ -4162,11 +4215,9 @@ catalog-remove-hook:
 UNINSTALL_DATA_HOOKS += \
        catalog-remove-hook
 
-manual_tests += \
-       test-journal-enum
-
 tests += \
        test-journal \
+       test-journal-enum \
        test-journal-send \
        test-journal-syslog \
        test-journal-match \
@@ -4489,32 +4540,6 @@ EXTRA_DIST += \
        src/vconsole/90-vconsole.rules.in \
        units/systemd-vconsole-setup.service.in
 
-# ------------------------------------------------------------------------------
-if ENABLE_BOOTCHART
-systemd_bootchart_SOURCES = \
-       src/bootchart/bootchart.c \
-       src/bootchart/bootchart.h \
-       src/bootchart/store.c \
-       src/bootchart/store.h \
-       src/bootchart/svg.c \
-       src/bootchart/svg.h
-
-systemd_bootchart_LDADD = \
-       libshared.la
-
-rootlibexec_PROGRAMS += \
-       systemd-bootchart
-
-dist_pkgsysconf_DATA += \
-       src/bootchart/bootchart.conf
-
-nodist_systemunit_DATA += \
-       units/systemd-bootchart.service
-endif
-
-EXTRA_DIST += \
-       units/systemd-bootchart.service.in
-
 # ------------------------------------------------------------------------------
 if ENABLE_QUOTACHECK
 rootlibexec_PROGRAMS += \
@@ -5273,8 +5298,15 @@ systemd_resolve_LDADD = \
 bin_PROGRAMS += \
        systemd-resolve
 
+dist_bashcompletion_data += \
+       shell-completion/bash/systemd-resolve
+
+dist_zshcompletion_data += \
+       shell-completion/zsh/_systemd-resolve
+
 tests += \
-       test-dns-domain \
+       test-dns-packet \
+       test-resolve-tables \
        test-dnssec
 
 manual_tests += \
@@ -5366,6 +5398,8 @@ libnetworkd_core_la_CFLAGS = \
 libnetworkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \
        src/network/networkd.h \
+       src/network/networkd-conf.h \
+       src/network/networkd-conf.c \
        src/network/networkd-link.h \
        src/network/networkd-link.c \
        src/network/networkd-netdev.h \
@@ -5409,9 +5443,12 @@ libnetworkd_core_la_SOURCES = \
        src/network/networkd-address-pool.h \
        src/network/networkd-address-pool.c \
        src/network/networkd-util.h \
-       src/network/networkd-util.c
+       src/network/networkd-util.c \
+       src/network/networkd-lldp-tx.h \
+       src/network/networkd-lldp-tx.c
 
 nodist_libnetworkd_core_la_SOURCES = \
+       src/network/networkd-gperf.c \
        src/network/networkd-network-gperf.c \
        src/network/networkd-netdev-gperf.c
 
@@ -5508,6 +5545,7 @@ BUSNAMES_TARGET_WANTS += \
 endif
 
 gperf_gperf_sources += \
+       src/network/networkd-gperf.gperf \
        src/network/networkd-network-gperf.gperf \
        src/network/networkd-netdev-gperf.gperf
 
@@ -5825,6 +5863,7 @@ substitutions = \
        '|PYTHON=$(PYTHON)|' \
        '|NTP_SERVERS=$(NTP_SERVERS)|' \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
+       '|DEFAULT_DNSSEC_MODE=$(DEFAULT_DNSSEC_MODE)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
        '|TTY_GID=$(TTY_GID)|' \
@@ -6130,7 +6169,6 @@ DISTCHECK_CONFIGURE_FLAGS += \
 endif
 
 .PHONY: dist-check-help
-
 dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
        for i in $(abspath $^); do                                             \
             if $$i  --help | grep -v 'default:' | grep -E -q '.{80}.' ; then   \
@@ -6139,6 +6177,18 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
                exit 1;                                                        \
             fi; done
 
+include_compilers = "$(CC)" "$(CC) -ansi" "$(CC) -std=iso9899:1990"
+public_headers = $(filter-out src/systemd/_sd-common.h, $(pkginclude_HEADERS) $(include_HEADERS))
+.PHONY: dist-check-includes
+dist-check-includes: $(public_headers)
+       @res=0;                                                                 \
+       for i in $(abspath $^); do                                              \
+           for cc in $(include_compilers); do                                  \
+               echo "$$cc -o/dev/null -c -x c -include "$$i" - </dev/null";    \
+               $$cc -o/dev/null -c -x c -include "$$i" - </dev/null || res=1;  \
+           done;                                                               \
+       done; exit $$res
+
 .PHONY: hwdb-update
 hwdb-update:
        ( cd $(top_srcdir)/hwdb && \