]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
projects / thirdparty / systemd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
resolved: explicitly refuse zone transfers using the bus API
[thirdparty/systemd.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index c566b1f6e4d61aa84f6041d2e70381a1c36c127e..3c13acf28d0a9bc3bff12757d5e9c6eddb3e0e5e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=14
+LIBSYSTEMD_CURRENT=15
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=14
+LIBSYSTEMD_AGE=15
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -141,6 +141,10 @@ else
 noinst_PROGRAMS =
 TESTS =
 endif
+AM_TESTS_ENVIRONMENT = \
+       export SYSTEMD_KBD_MODEL_MAP=$(abs_top_srcdir)/src/locale/kbd-model-map; \
+       export SYSTEMD_LANGUAGE_FALLBACK_MAP=$(abs_top_srcdir)/src/locale/language-fallback-map;
+
 if ENABLE_BASH_COMPLETION
 dist_bashcompletion_DATA = $(dist_bashcompletion_data)
 nodist_bashcompletion_DATA = $(nodist_bashcompletion_data)
@@ -213,6 +217,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/shared \
        -I $(top_builddir)/src/shared \
        -I $(top_srcdir)/src/network \
+       -I $(top_srcdir)/src/locale \
        -I $(top_srcdir)/src/login \
        -I $(top_srcdir)/src/journal \
        -I $(top_builddir)/src/journal \
@@ -467,6 +472,7 @@ dist_systemunit_DATA = \
        units/local-fs-pre.target \
        units/initrd.target \
        units/initrd-fs.target \
+       units/initrd-root-device.target \
        units/initrd-root-fs.target \
        units/remote-fs.target \
        units/remote-fs-pre.target \
@@ -745,10 +751,9 @@ noinst_LTLIBRARIES += \
 libbasic_la_SOURCES = \
        src/basic/missing.h \
        src/basic/missing_syscall.h \
+       src/basic/raw-clone.h \
        src/basic/capability-util.c \
        src/basic/capability-util.h \
-       src/basic/c-rbtree.c \
-       src/basic/c-rbtree.h \
        src/basic/conf-files.c \
        src/basic/conf-files.h \
        src/basic/stdio-util.h \
@@ -964,6 +969,7 @@ noinst_LTLIBRARIES += \
 
 libshared_la_SOURCES = \
        src/shared/output-mode.h \
+       src/shared/output-mode.c \
        src/shared/gpt.h \
        src/shared/udev-util.h \
        src/shared/linux/auto_dev-ioctl.h \
@@ -1038,7 +1044,13 @@ libshared_la_SOURCES = \
        src/shared/machine-pool.c \
        src/shared/machine-pool.h \
        src/shared/resolve-util.c \
-       src/shared/resolve-util.h
+       src/shared/resolve-util.h \
+       src/shared/bus-unit-util.c \
+       src/shared/bus-unit-util.h \
+       src/shared/vlan-util.h \
+       src/shared/vlan-util.c \
+       src/shared/tests.h \
+       src/shared/tests.c
 
 if HAVE_UTMP
 libshared_la_SOURCES += \
@@ -1494,7 +1506,6 @@ tests += \
        test-copy \
        test-cap-list \
        test-sigbus \
-       test-rbtree \
        test-verbs \
        test-af-list \
        test-arphrd-list \
@@ -1748,12 +1759,6 @@ test_sigbus_SOURCES = \
 test_sigbus_LDADD = \
        libshared.la
 
-test_rbtree_SOURCES = \
-       src/test/test-rbtree.c
-
-test_rbtree_LDADD = \
-       libshared.la
-
 test_condition_SOURCES = \
        src/test/test-condition.c
 
@@ -2897,29 +2902,9 @@ systemd_gpt_auto_generator_CFLAGS = \
 endif
 
 # ------------------------------------------------------------------------------
-systemgenerator_PROGRAMS +=  \
-       systemd-dbus1-generator
-
-systemd_dbus1_generator_SOURCES = \
-       src/dbus1-generator/dbus1-generator.c
-
-systemd_dbus1_generator_LDADD = \
-       libshared.la
-
-dbus1-generator-install-hook:
-       $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
-       $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-       $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-
-dbus1-generator-uninstall-hook:
-       rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-
 dist_xinitrc_SCRIPTS = \
        xorg/50-systemd-user.sh
 
-INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
-UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
-
 # ------------------------------------------------------------------------------
 systemd_sysv_generator_SOURCES = \
        src/sysv-generator/sysv-generator.c
@@ -3019,16 +3004,22 @@ systemd_nspawn_SOURCES = \
        src/nspawn/nspawn-expose-ports.h \
        src/nspawn/nspawn-cgroup.c \
        src/nspawn/nspawn-cgroup.h \
+       src/nspawn/nspawn-seccomp.c \
+       src/nspawn/nspawn-seccomp.h \
        src/nspawn/nspawn-register.c \
        src/nspawn/nspawn-register.h \
        src/nspawn/nspawn-setuid.c \
        src/nspawn/nspawn-setuid.h \
        src/nspawn/nspawn-stub-pid1.c \
        src/nspawn/nspawn-stub-pid1.h \
+       src/nspawn/nspawn-patch-uid.c \
+       src/nspawn/nspawn-patch-uid.h \
        src/core/mount-setup.c \
        src/core/mount-setup.h \
        src/core/loopback-setup.c \
-       src/core/loopback-setup.h
+       src/core/loopback-setup.h \
+       src/core/machine-id-setup.c \
+       src/core/machine-id-setup.h
 
 nodist_systemd_nspawn_SOURCES = \
        src/nspawn/nspawn-gperf.c
@@ -3050,6 +3041,17 @@ systemd_nspawn_LDADD += \
        libfirewall.la
 endif
 
+test_patch_uid_SOURCES = \
+       src/nspawn/nspawn-patch-uid.c \
+       src/nspawn/nspawn-patch-uid.h \
+       src/nspawn/test-patch-uid.c
+
+test_patch_uid_LDADD = \
+       libshared.la
+
+manual_tests += \
+       test-patch-uid
+
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
        src/run/run.c
@@ -3415,6 +3417,9 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/network-internal.c \
        src/libsystemd-network/network-internal.h \
        src/libsystemd-network/sd-ndisc.c \
+       src/libsystemd-network/ndisc-internal.h \
+       src/libsystemd-network/ndisc-router.h \
+       src/libsystemd-network/ndisc-router.c \
        src/libsystemd-network/icmp6-util.h \
        src/libsystemd-network/icmp6-util.c \
        src/libsystemd-network/sd-dhcp6-client.c \
@@ -3587,7 +3592,8 @@ INSTALL_DIRS += \
 dist_network_DATA = \
        network/99-default.link \
        network/80-container-host0.network \
-       network/80-container-ve.network
+       network/80-container-ve.network \
+       network/80-container-vz.network
 
 dist_udevrules_DATA += \
        rules/50-udev-default.rules \
@@ -4337,6 +4343,7 @@ dist_pkgsysconf_DATA += \
        src/journal/journald.conf
 
 dist_catalog_DATA = \
+       catalog/systemd.bg.catalog \
        catalog/systemd.be.catalog \
        catalog/systemd.be@latin.catalog \
        catalog/systemd.fr.catalog \
@@ -4724,11 +4731,13 @@ BUSNAMES_TARGET_WANTS += \
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
-       src/locale/localed.c
+       src/locale/localed.c \
+       src/locale/keymap-util.c \
+       src/locale/keymap-util.h
 
 systemd_localed_LDADD = \
        libshared.la \
-       $(XKBCOMMON_LIBS)
+       -ldl
 
 systemd_localed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -4762,6 +4771,18 @@ dist_pkgdata_DATA = \
        src/locale/kbd-model-map \
        src/locale/language-fallback-map
 
+test_keymap_util_SOURCES = \
+       src/locale/test-keymap-util.c \
+       src/locale/keymap-util.c \
+       src/locale/keymap-util.h
+
+test_keymap_util_LDADD = \
+       libshared.la \
+       -ldl
+
+tests += \
+       test-keymap-util
+
 localectl_SOURCES = \
        src/locale/localectl.c
 
@@ -4931,7 +4952,9 @@ libmachine_core_la_SOURCES = \
        src/machine/machine-dbus.c \
        src/machine/machine-dbus.h \
        src/machine/image-dbus.c \
-       src/machine/image-dbus.h
+       src/machine/image-dbus.h \
+       src/machine/operation.c \
+       src/machine/operation.h
 
 libmachine_core_la_LIBADD = \
        libshared.la
@@ -5419,6 +5442,8 @@ libnetworkd_core_la_SOURCES = \
        src/network/networkd-link.c \
        src/network/networkd-netdev.h \
        src/network/networkd-netdev.c \
+       src/network/networkd-netdev-vrf.h \
+       src/network/networkd-netdev-vrf.c \
        src/network/networkd-netdev-tunnel.h \
        src/network/networkd-netdev-tunnel.c \
        src/network/networkd-netdev-veth.h \
@@ -5443,6 +5468,7 @@ libnetworkd_core_la_SOURCES = \
        src/network/networkd-ipv4ll.c \
        src/network/networkd-dhcp4.c \
        src/network/networkd-dhcp6.c \
+       src/network/networkd-ndisc.h \
        src/network/networkd-ndisc.c \
        src/network/networkd-network.h \
        src/network/networkd-network.c \
@@ -5455,6 +5481,8 @@ libnetworkd_core_la_SOURCES = \
        src/network/networkd-manager-bus.c \
        src/network/networkd-fdb.h \
        src/network/networkd-fdb.c \
+       src/network/networkd-brvlan.h \
+       src/network/networkd-brvlan.c \
        src/network/networkd-address-pool.h \
        src/network/networkd-address-pool.c \
        src/network/networkd-util.h \
@@ -5502,6 +5530,12 @@ networkctl_LDADD = \
 dist_bashcompletion_data += \
        shell-completion/bash/networkctl
 
+test_networkd_conf_SOURCES = \
+       src/network/test-networkd-conf.c
+
+test_networkd_conf_LDADD = \
+       libnetworkd-core.la
+
 test_network_SOURCES = \
        src/network/test-network.c
 
@@ -5527,6 +5561,7 @@ test_network_tables_LDADD += \
 endif
 
 tests += \
+       test-networkd-conf \
        test-network \
        test-network-tables
 
@@ -5725,7 +5760,7 @@ dist_dbussystemservice_DATA += \
 dist_dbuspolicy_DATA += \
        src/login/org.freedesktop.login1.conf
 
-dist_pkgsysconf_DATA += \
+nodist_pkgsysconf_DATA += \
        src/login/logind.conf
 
 polkitpolicy_files += \
@@ -5762,7 +5797,8 @@ gperf_gperf_sources += \
 EXTRA_DIST += \
        src/login/71-seat.rules.in \
        src/login/73-seat-late.rules.in \
-       units/systemd-logind.service.in
+       units/systemd-logind.service.in \
+       src/login/logind.conf.in
 
 # ------------------------------------------------------------------------------
 if HAVE_PAM
@@ -5815,6 +5851,16 @@ EXTRA_DIST += \
        test/TEST-07-ISSUE-1981/Makefile \
        test/TEST-07-ISSUE-1981/test-segfault.sh \
        test/TEST-07-ISSUE-1981/test.sh \
+       test/TEST-08-ISSUE-2730/Makefile \
+       test/TEST-08-ISSUE-2730/test.sh \
+       test/TEST-09-ISSUE-2691/Makefile \
+       test/TEST-09-ISSUE-2691/test.sh \
+       test/TEST-10-ISSUE-2467/Makefile \
+       test/TEST-10-ISSUE-2467/test.sh \
+       test/TEST-11-ISSUE-3166/Makefile \
+       test/TEST-11-ISSUE-3166/test.sh \
+       test/TEST-12-ISSUE-3171/Makefile \
+       test/TEST-12-ISSUE-3171/test.sh \
        test/test-functions
 
 EXTRA_DIST += \
@@ -5879,6 +5925,7 @@ substitutions = \
        '|NTP_SERVERS=$(NTP_SERVERS)|' \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|DEFAULT_DNSSEC_MODE=$(DEFAULT_DNSSEC_MODE)|' \
+       '|KILL_USER_PROCESSES=$(KILL_USER_PROCESSES)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
        '|TTY_GID=$(TTY_GID)|' \
@@ -6212,7 +6259,11 @@ hwdb-update:
        wget -O ma-large.txt 'http://standards.ieee.org/develop/regauth/oui/oui.txt' && \
        wget -O ma-medium.txt 'http://standards.ieee.org/develop/regauth/oui28/mam.txt' && \
        wget -O ma-small.txt 'http://standards.ieee.org/develop/regauth/oui36/oui36.txt' && \
-       ./ids-update.pl )
+       wget -O pnp_id_registry.html 'http://www.uefi.org/uefi-pnp-export' && \
+       wget -O acpi_id_registry.html 'http://www.uefi.org/uefi-acpi-export' && \
+       ./ids-update.pl && \
+       ./acpi-update.py > 20-acpi-vendor.hwdb.base && \
+       patch -p0 -o- 20-acpi-vendor.hwdb.base < 20-acpi-vendor.hwdb.patch > 20-acpi-vendor.hwdb )
 
 .PHONY: built-sources
 built-sources: $(BUILT_SOURCES)
Unnamed repository; edit this file 'description' to name the repository.