.PRECIOUS: $(TEST_SUITE_LOG) Makefile
LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=2
LIBUDEV_AGE=6
LIBGUDEV_CURRENT=2
LIBGUDEV_AGE=2
LIBSYSTEMD_CURRENT=5
-LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_REVISION=1
LIBSYSTEMD_AGE=5
# The following four libraries only exist for compatibility reasons,
dbussystemservicedir=@dbussystemservicedir@
pamlibdir=@pamlibdir@
pamconfdir=@pamconfdir@
-pkgconfigdatadir=$(datadir)/pkgconfig
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=@bashcompletiondir@
-I $(top_srcdir)/src/libsystemd/sd-event \
-I $(top_srcdir)/src/libsystemd/sd-rtnl \
-I $(top_srcdir)/src/libsystemd/sd-network \
+ -I $(top_srcdir)/src/libsystemd/sd-hwdb \
-I $(top_srcdir)/src/libsystemd-network \
-I $(top_srcdir)/src/libsystemd-terminal \
$(OUR_CPPFLAGS)
systemd-remount-fs \
systemd-reply-password \
systemd-fsck \
+ systemd-machine-id-commit \
systemd-ac-power \
systemd-sysctl \
systemd-sleep \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
- units/initrd-switch-root.target
+ units/initrd-switch-root.target \
+ units/machines.target
if ENABLE_KDBUS
dist_systemunit_DATA += \
units/systemd-kexec.service \
units/systemd-fsck@.service \
units/systemd-fsck-root.service \
+ units/systemd-machine-id-commit.service \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
- units/systemd-udev-hwdb-update.service \
+ units/systemd-hwdb-update.service \
units/debug-shell.service \
units/initrd-parse-etc.service \
units/initrd-cleanup.service \
units/user/systemd-exit.service.in \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
- units/user@.service.in \
+ units/systemd-machine-id-commit.service.in \
+ units/user@.service.m4.in \
units/debug-shell.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
libsystemd-shared.la
libsystemd_shared_la_SOURCES = \
+ src/shared/capability.c \
+ src/shared/capability.h \
src/shared/linux/auto_dev-ioctl.h \
src/shared/ioprio.h \
src/shared/missing.h \
src/shared/sparse-endian.h \
src/shared/refcnt.h \
src/shared/udev-util.h \
- src/shared/bus-errors.h \
- src/shared/bus-errors.c \
src/shared/device-nodes.c \
src/shared/device-nodes.h \
src/shared/util.c \
src/shared/socket-util.h \
src/shared/in-addr-util.c \
src/shared/in-addr-util.h \
+ src/shared/ether-addr-util.h \
src/shared/conf-files.c \
src/shared/conf-files.h \
src/shared/cgroup-util.c \
src/shared/af-list.h \
src/shared/arphrd-list.c \
src/shared/arphrd-list.h \
+ src/shared/cap-list.c \
+ src/shared/cap-list.h \
src/shared/audit.c \
src/shared/audit.h \
src/shared/xml.c \
src/shared/xml.h \
- src/shared/condition-util.c \
- src/shared/condition-util.h \
+ src/shared/json.c \
+ src/shared/json.h \
src/shared/bus-label.c \
src/shared/bus-label.h \
src/shared/gpt.h \
src/shared/memfd-util.h \
src/shared/uid-range.c \
src/shared/uid-range.h \
- src/shared/nss-util.h
+ src/shared/nss-util.h \
+ src/shared/btrfs-util.c \
+ src/shared/btrfs-util.h \
+ src/shared/btrfs-ctree.h \
+ src/shared/verbs.c \
+ src/shared/verbs.h \
+ src/shared/machine-image.c \
+ src/shared/machine-image.h \
+ src/shared/sigbus.c \
+ src/shared/sigbus.h \
+ src/shared/build.h
if HAVE_UTMP
libsystemd_shared_la_SOURCES += \
src/shared/af-from-name.h \
src/shared/af-to-name.h \
src/shared/arphrd-from-name.h \
- src/shared/arphrd-to-name.h
+ src/shared/arphrd-to-name.h \
+ src/shared/cap-from-name.h \
+ src/shared/cap-to-name.h
libsystemd_shared_la_CFLAGS = \
$(AM_CFLAGS) \
+ $(CAP_CFLAGS) \
$(SECCOMP_CFLAGS) \
-pthread
+libsystemd_shared_la_LIBADD = \
+ $(CAP_LIBS)
+
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd-units.la
src/shared/dev-setup.h \
src/shared/dropin.c \
src/shared/dropin.h \
+ src/shared/condition.c \
+ src/shared/condition.h \
src/shared/generator.h \
src/shared/generator.c
src/shared/logs-show.c \
src/shared/logs-show.h
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
- libsystemd-capability.la
-
-libsystemd_capability_la_SOURCES = \
- src/shared/capability.c \
- src/shared/capability.h
-
-libsystemd_capability_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(CAP_CFLAGS)
-
-libsystemd_capability_la_LIBADD = \
- $(CAP_LIBS)
-
# ------------------------------------------------------------------------------
if HAVE_ACL
noinst_LTLIBRARIES += \
src/core/socket.h \
src/core/busname.c \
src/core/busname.h \
- src/core/bus-common.c \
- src/core/bus-common.h \
src/core/bus-endpoint.c \
src/core/bus-endpoint.h \
+ src/core/bus-policy.c \
+ src/core/bus-policy.h \
src/core/target.c \
src/core/target.h \
src/core/snapshot.c \
src/core/machine-id-setup.h \
src/core/mount-setup.c \
src/core/mount-setup.h \
+ src/core/kmod-setup.c \
+ src/core/kmod-setup.h \
src/core/loopback-setup.h \
src/core/loopback-setup.c \
- src/core/condition.c \
- src/core/condition.h \
src/core/namespace.c \
src/core/namespace.h \
- src/core/build.h \
- src/core/sysfs-show.h \
src/core/killall.h \
src/core/killall.c \
src/core/audit-fd.c \
src/core/failure-action.c \
src/core/failure-action.h
-if HAVE_KMOD
-libsystemd_core_la_SOURCES += \
- src/core/kmod-setup.c \
- src/core/kmod-setup.h
-endif
-
nodist_libsystemd_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
src/core/load-fragment-gperf-nulstr.c
$(AM_CFLAGS) \
$(PAM_CFLAGS) \
$(AUDIT_CFLAGS) \
- $(CAP_CFLAGS) \
$(KMOD_CFLAGS) \
$(APPARMOR_CFLAGS) \
$(SECCOMP_CFLAGS) \
+ $(MOUNT_CFLAGS) \
-pthread
libsystemd_core_la_LIBADD = \
- libsystemd-capability.la \
libsystemd-units.la \
libsystemd-label.la \
libudev-internal.la \
libsystemd-internal.la \
$(PAM_LIBS) \
$(AUDIT_LIBS) \
- $(CAP_LIBS) \
$(KMOD_LIBS) \
$(APPARMOR_LIBS) \
- $(SECCOMP_LIBS)
+ $(SECCOMP_LIBS) \
+ $(MOUNT_LIBS)
if HAVE_SECCOMP
libsystemd_core_la_LIBADD += \
src/shared/af-from-name.gperf \
src/shared/arphrd-list.txt \
src/shared/arphrd-from-name.gperf \
- src/shared/dns_type-list.txt \
- src/shared/dns_type-from-name.gperf
+ src/shared/cap-list.txt \
+ src/shared/cap-from-name.gperf \
+ src/resolve/dns_type-list.txt \
+ src/resolve/dns_type-from-name.gperf
BUILT_SOURCES += \
src/shared/errno-from-name.h \
src/shared/af-to-name.h \
src/shared/arphrd-from-name.h \
src/shared/arphrd-to-name.h \
+ src/shared/cap-from-name.h \
+ src/shared/cap-to-name.h \
src/resolve/dns_type-from-name.h \
src/resolve/dns_type-to-name.h
src/shared/af-to-name.h: src/shared/af-list.txt
$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
+
src/shared/arphrd-list.txt:
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
+src/shared/cap-list.txt:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
+
+src/shared/cap-to-name.h: src/shared/cap-list.txt
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
+
+src/shared/cap-from-name.gperf: src/shared/cap-list.txt
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
+
+src/shared/cap-from-name.h: src/shared/cap-from-name.gperf
+ $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
+
+
src/resolve/dns_type-list.txt: src/resolve/dns-type.h
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@
polkitpolicy_in_in_files += \
src/core/org.freedesktop.systemd1.policy.in.in
-pkgconfigdata_DATA = \
+pkgconfiglib_DATA += \
src/core/systemd.pc
nodist_rpmmacros_DATA = \
test-install \
test-watchdog \
test-log \
- test-ipcrm
+ test-ipcrm \
+ test-btrfs
if HAVE_KMOD
manual_tests += \
test-env-replace \
test-strbuf \
test-strv \
+ test-path \
test-path-util \
test-strxcpyx \
test-unit-name \
test-tables \
test-device-nodes \
test-xml \
+ test-json \
test-architecture \
test-socket-util \
test-fdset \
test-capability \
test-async \
test-ratelimit \
- test-condition-util \
+ test-condition \
test-uid-range \
test-bus-policy \
test-locale-util \
- test-copy
+ test-execute \
+ test-copy \
+ test-cap-list \
+ test-sigbus \
+ test-verbs
EXTRA_DIST += \
test/a.service \
test/testsuite.target \
test/timers.target \
test/unstoppable.service \
+ test/path-changed.service \
+ test/path-directorynotempty.service \
+ test/path-existsglob.service \
+ test/path-exists.service \
+ test/path-makedirectory.service \
+ test/path-modified.service \
+ test/path-mycustomunit.service \
+ test/path-service.service \
+ test/path-changed.path \
+ test/path-directorynotempty.path \
+ test/path-existsglob.path \
+ test/path-exists.path \
+ test/path-makedirectory.path \
+ test/path-modified.path \
+ test/path-unit.path \
+ test/exec-environment-empty.service \
+ test/exec-environment-multiple.service \
+ test/exec-environment.service \
+ test/exec-group.service \
+ test/exec-ignoresigpipe-no.service \
+ test/exec-ignoresigpipe-yes.service \
+ test/exec-personality-x86-64.service \
+ test/exec-personality-x86.service \
+ test/exec-privatedevices-no.service \
+ test/exec-privatedevices-yes.service \
+ test/exec-privatetmp-no.service \
+ test/exec-privatetmp-yes.service \
+ test/exec-systemcallerrornumber.service \
+ test/exec-systemcallfilter-failing2.service \
+ test/exec-systemcallfilter-failing.service \
+ test/exec-systemcallfilter-not-failing2.service \
+ test/exec-systemcallfilter-not-failing.service \
+ test/exec-user.service \
+ test/exec-workingdirectory.service \
+ test/exec-umask-0177.service \
+ test/exec-umask-default.service \
test/bus-policy/hello.conf \
test/bus-policy/methods.conf \
test/bus-policy/ownerships.conf \
- test/bus-policy/signals.conf
+ test/bus-policy/signals.conf \
+ test/bus-policy/check-own-rules.conf \
+ test/bus-policy/many-rules.conf \
+ test/bus-policy/test.conf
EXTRA_DIST += \
src/test/test-capability.c
test_capability_LDADD = \
- libsystemd-shared.la \
- libsystemd-capability.la
+ libsystemd-shared.la
test_async_SOURCES = \
src/test/test-async.c
test_copy_LDADD = \
libsystemd-shared.la
-test_condition_util_SOURCES = \
- src/test/test-condition-util.c
+test_sigbus_SOURCES = \
+ src/test/test-sigbus.c
-test_condition_util_LDADD = \
- libsystemd-shared.la \
- libsystemd-internal.la
+test_sigbus_LDADD = \
+ libsystemd-shared.la
+test_condition_SOURCES = \
+ src/test/test-condition.c
+
+test_condition_LDADD = \
+ libsystemd-label.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_fdset_SOURCES = \
src/test/test-fdset.c
test_fdset_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
test_ratelimit_SOURCES = \
src/test/test-ratelimit.c
src/test/test-util.c
test_util_LDADD = \
- libsystemd-core.la
+ -lm \
+ libsystemd-shared.la
test_uid_range_SOURCES = \
src/test/test-uid-range.c
test_uid_range_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
+
+test_cap_list_SOURCES = \
+ src/test/test-cap-list.c
+
+test_cap_list_LDADD = \
+ libsystemd-shared.la
test_socket_util_SOURCES = \
src/test/test-socket-util.c
test_socket_util_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_ring_SOURCES = \
src/test/test-ring.c
test_ring_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_barrier_SOURCES = \
src/test/test-barrier.c
test_barrier_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_pty_SOURCES = \
src/test/test-pty.c
test_namespace_SOURCES = \
src/test/test-namespace.c
+test_verbs_SOURCES = \
+ src/test/test-verbs.c
+
+test_verbs_LDADD = \
+ libsystemd-shared.la
+
test_namespace_LDADD = \
libsystemd-core.la
src/test/test-hashmap-plain.c
test_hashmap_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_set_SOURCES = \
src/test/test-set.c
test_set_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_xml_SOURCES = \
src/test/test-xml.c
test_xml_LDADD = \
libsystemd-shared.la
+test_json_SOURCES = \
+ src/test/test-json.c
+
+test_json_LDADD = \
+ libsystemd-shared.la \
+ -lm
+
test_list_SOURCES = \
src/test/test-list.c
+test_list_LDADD = \
+ libsystemd-shared.la
+
test_unaligned_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_unaligned_SOURCES = \
src/test/test-unaligned.c
-test_list_LDADD = \
- libsystemd-core.la
-
test_tables_SOURCES = \
src/test/test-tables.c \
src/shared/test-tables.h \
- src/bus-proxyd/bus-policy.c \
- src/bus-proxyd/bus-policy.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
src/test/test-prioq.c
test_prioq_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_fileio_SOURCES = \
src/test/test-fileio.c
test_fileio_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_time_SOURCES = \
src/test/test-time.c
test_time_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_architecture_SOURCES = \
src/test/test-architecture.c
src/test/test-log.c
test_log_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_ipcrm_SOURCES = \
src/test/test-ipcrm.c
libsystemd-shared.la \
-lrt
+test_btrfs_SOURCES = \
+ src/test/test-btrfs.c
+
+test_btrfs_LDADD = \
+ libsystemd-shared.la
+
test_rtnl_manual_SOURCES = \
src/test/test-rtnl-manual.c
src/test/test-ellipsize.c
test_ellipsize_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_date_SOURCES = \
src/test/test-date.c
test_date_LDADD = \
- libsystemd-core.la
+ libsystemd-shared.la
test_sleep_SOURCES = \
src/test/test-sleep.c
src/test/test-cgroup-mask.c
test_cgroup_mask_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+ $(AM_CPPFLAGS)
test_cgroup_mask_CFLAGS = \
$(AM_CFLAGS) \
test_path_util_LDADD = \
libsystemd-shared.la
+test_path_SOURCES = \
+ src/test/test-path.c
+
+test_path_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_path_LDADD = \
+ libsystemd-core.la
+
+test_execute_SOURCES = \
+ src/test/test-execute.c
+
+test_execute_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_execute_LDADD = \
+ libsystemd-core.la
+
test_strxcpyx_SOURCES = \
src/test/test-strxcpyx.c
src/test/test-sched-prio.c
test_sched_prio_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+ $(AM_CPPFLAGS)
test_sched_prio_CFLAGS = \
$(AM_CFLAGS) \
libsystemd-shared.la
test_bus_policy_SOURCES = \
- src/bus-proxyd/test-bus-policy.c \
- src/bus-proxyd/bus-policy.c \
- src/bus-proxyd/bus-policy.h
+ src/bus-proxyd/test-bus-xml-policy.c \
+ src/bus-proxyd/bus-xml-policy.c \
+ src/bus-proxyd/bus-xml-policy.h
test_bus_policy_LDADD = \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la
$(MKDIR_P) $(coverage_dir)
lcov $(coverage_opts) --compat-libtool --capture --no-external \
| sed 's|$(abspath $(builddir))|$(abspath $(srcdir))|' > $(coverage_dir)/.lcov.info
- genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov.info
+ lcov --remove $(coverage_dir)/.lcov.info --output-file $(coverage_dir)/.lcov-clean.info 'test-*'
+ genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov-clean.info
@echo "Coverage report generated in $(abs_builddir)/$(coverage_dir)/index.html"
# lcov doesn't work properly with vpath builds, make sure that bad
systemd_tmpfiles_LDADD = \
libsystemd-units.la \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
tmpfiles.d/systemd-nologin.conf \
- tmpfiles.d/systemd-remote.conf \
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf \
tmpfiles.d/var.conf
systemd_sysusers_LDADD = \
libsystemd-units.la \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la
systemd-sysusers.service
dist_sysusers_DATA = \
- sysusers.d/systemd.conf \
- sysusers.d/systemd-remote.conf
+ sysusers.d/systemd.conf
nodist_sysusers_DATA = \
sysusers.d/basic.conf
systemd_firstboot_LDADD = \
libsystemd-units.la \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la \
-lcrypt
libudev-internal.la \
libsystemd-shared.la
+# ------------------------------------------------------------------------------
+systemd_machine_id_commit_SOURCES = \
+ src/machine-id-commit/machine-id-commit.c \
+ src/core/machine-id-setup.c \
+ src/core/machine-id-setup.h
+
+systemd_machine_id_commit_LDADD = \
+ libsystemd-label.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+SYSINIT_TARGET_WANTS += \
+ systemd-machine-id-commit.service
+
# ------------------------------------------------------------------------------
systemd_ac_power_SOURCES = \
src/ac-power/ac-power.c
systemd_dbus1_generator_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la \
- libsystemd-internal.la
+ libsystemd-internal.la \
+ libsystemd-shared.la
dbus1-generator-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
systemd_nspawn_LDADD = \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la \
systemd_run_LDADD = \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_bus_proxyd_SOURCES = \
src/bus-proxyd/bus-proxyd.c \
- src/bus-proxyd/bus-policy.c \
- src/bus-proxyd/bus-policy.h
+ src/bus-proxyd/bus-xml-policy.c \
+ src/bus-proxyd/bus-xml-policy.h
systemd_bus_proxyd_LDADD = \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la
endif
EXTRA_DIST += \
- units/systemd-bus-proxyd@.service.in \
+ units/systemd-bus-proxyd@.service.m4.in \
units/user/systemd-bus-proxyd@.service.in
+CLEANFILES += \
+ units/systemd-bus-proxyd@.service.m4
+
+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
src/systemd/sd-daemon.h \
src/systemd/sd-path.h \
src/systemd/sd-network.h \
+ src/systemd/sd-hwdb.h \
src/libsystemd/sd-bus/sd-bus.c \
src/libsystemd/sd-bus/bus-control.c \
src/libsystemd/sd-bus/bus-control.h \
src/libsystemd/sd-bus/bus-error.c \
src/libsystemd/sd-bus/bus-error.h \
+ src/libsystemd/sd-bus/bus-common-errors.h \
+ src/libsystemd/sd-bus/bus-common-errors.c \
src/libsystemd/sd-bus/bus-internal.c \
src/libsystemd/sd-bus/bus-internal.h \
src/libsystemd/sd-bus/bus-socket.c \
src/libsystemd/sd-path/sd-path.c \
src/libsystemd/sd-network/sd-network.c \
src/libsystemd/sd-network/network-util.h \
- src/libsystemd/sd-network/network-util.c
+ src/libsystemd/sd-network/network-util.c \
+ src/libsystemd/sd-hwdb/sd-hwdb.c \
+ src/libsystemd/sd-hwdb/hwdb-util.h \
+ src/libsystemd/sd-hwdb/hwdb-internal.h
nodist_libsystemd_internal_la_SOURCES = \
src/libsystemd/libsystemd.sym
src/libsystemd/sd-bus/bus-dump.c \
src/libsystemd/sd-bus/bus-dump.h
-libsystemd_dump_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(CAP_CFLAGS)
-
noinst_LTLIBRARIES += \
libsystemd-dump.la
test-bus-gvariant \
test-event \
test-rtnl \
+ test-local-addresses \
test-resolve
bin_PROGRAMS += \
src/libsystemd/sd-bus/test-bus-marshal.c
test_bus_marshal_LDADD = \
+ libsystemd-dump.la \
libsystemd-internal.la \
libsystemd-shared.la \
- libsystemd-dump.la \
- libsystemd-capability.la \
$(GLIB_LIBS) \
- $(DBUS_LIBS) \
- $(CAP_LIBS)
+ $(DBUS_LIBS)
test_bus_marshal_CFLAGS = \
$(AM_CFLAGS) \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(CAP_CFLAGS)
+ $(DBUS_CFLAGS)
test_bus_signature_SOURCES = \
src/libsystemd/sd-bus/test-bus-signature.c
test_bus_signature_LDADD = \
- libsystemd-shared.la \
- libsystemd-internal.la
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_bus_chat_SOURCES = \
src/libsystemd/sd-bus/test-bus-chat.c
test_bus_objects_CFLAGS = \
$(AM_CFLAGS) \
- $(CAP_CFLAGS) \
-pthread
test_bus_objects_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la \
libsystemd-dump.la \
- libsystemd-capability.la \
- $(CAP_LIBS)
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_bus_error_SOURCES = \
src/libsystemd/sd-bus/test-bus-error.c
src/libsystemd/sd-bus/test-bus-gvariant.c
test_bus_gvariant_LDADD = \
+ libsystemd-dump.la \
libsystemd-internal.la \
libsystemd-shared.la \
- libsystemd-dump.la \
- libsystemd-capability.la \
- $(GLIB_LIBS) \
- $(CAP_LIBS)
+ $(GLIB_LIBS)
test_bus_gvariant_CFLAGS = \
$(AM_CFLAGS) \
$(GLIB_CFLAGS)
- $(CAP_CFLAGS)
test_bus_creds_SOURCES = \
src/libsystemd/sd-bus/test-bus-creds.c
test_bus_creds_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la \
libsystemd-dump.la \
- libsystemd-capability.la
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_bus_match_SOURCES = \
src/libsystemd/sd-bus/test-bus-match.c
src/libsystemd/sd-bus/test-bus-kernel.c
test_bus_kernel_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la \
libsystemd-dump.la \
- libsystemd-capability.la \
- $(CAP_LIBS)
-
-test_bus_kernel_CFLAGS = \
- $(AM_CFLAGS) \
- $(CAP_CFLAGS)
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_bus_kernel_bloom_SOURCES = \
src/libsystemd/sd-bus/test-bus-kernel-bloom.c
src/libsystemd/sd-bus/test-bus-zero-copy.c
test_bus_zero_copy_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la \
libsystemd-dump.la \
- libsystemd-capability.la \
- $(CAP_LIBS)
-
-test_bus_zero_copy_CFLAGS = \
- $(AM_CFLAGS) \
- $(CAP_CFLAGS)
+ libsystemd-internal.la \
+ libsystemd-shared.la
test_bus_introspect_SOURCES = \
src/libsystemd/sd-bus/test-bus-introspect.c
libsystemd-internal.la \
libsystemd-shared.la
+test_local_addresses_SOURCES = \
+ src/libsystemd/sd-rtnl/test-local-addresses.c
+
+test_local_addresses_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
test_resolve_SOURCES = \
src/libsystemd/sd-resolve/test-resolve.c
-pthread
busctl_SOURCES = \
- src/libsystemd/sd-bus/busctl.c
+ src/libsystemd/sd-bus/busctl.c \
+ src/libsystemd/sd-bus/busctl-introspect.c \
+ src/libsystemd/sd-bus/busctl-introspect.h
busctl_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la \
libsystemd-dump.la \
- libsystemd-capability.la \
- $(CAP_LIBS)
-
-busctl_CFLAGS = \
- $(AM_CFLAGS) \
- $(CAP_CFLAGS)
+ libsystemd-internal.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-dhcp6-lease.h \
src/systemd/sd-pppoe.h \
+ src/systemd/sd-lldp.h \
src/libsystemd-network/sd-dhcp-client.c \
src/libsystemd-network/sd-dhcp-server.c \
src/libsystemd-network/dhcp-network.c \
src/libsystemd-network/dhcp6-network.c \
src/libsystemd-network/dhcp6-option.c \
src/libsystemd-network/dhcp6-lease-internal.h \
- src/libsystemd-network/sd-dhcp6-lease.c
+ src/libsystemd-network/sd-dhcp6-lease.c \
+ src/libsystemd-network/lldp.h \
+ src/libsystemd-network/lldp-tlv.h \
+ src/libsystemd-network/lldp-tlv.c \
+ 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-util.h \
+ src/libsystemd-network/sd-lldp.c
libsystemd_network_la_LIBADD = \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-shared.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 = \
+ libsystemd-network.la \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
tests += \
test-dhcp-option \
test-dhcp-client \
test-dhcp-server \
test-ipv4ll \
test-icmp6-rs \
- test-dhcp6-client
+ test-dhcp6-client \
+ test-lldp
manual_tests += \
test-pppoe
USER_DEFAULT_TARGET_WANTS += \
systemd-consoled.service
-EXTRA_DIST += \
- units/user/systemd-consoled.service.in
-
tests += \
test-term-page \
test-term-parser \
test-unifont
endif
+EXTRA_DIST += \
+ units/user/systemd-consoled.service.in
+
libsystemd_terminal_la_CFLAGS = \
$(AM_CFLAGS) \
$(TERMINAL_CFLAGS)
src/libudev/libudev-enumerate.c \
src/libudev/libudev-monitor.c \
src/libudev/libudev-queue.c \
- src/libudev/libudev-hwdb-def.h \
src/libudev/libudev-hwdb.c
libudev_la_CFLAGS = \
# ------------------------------------------------------------------------------
INSTALL_DIRS += \
- $(sysconfdir)/udev/rules.d \
- $(sysconfdir)/udev/hwdb.d
+ $(sysconfdir)/udev/rules.d
dist_network_DATA = \
network/99-default.link \
rules/50-udev-default.rules \
rules/60-drm.rules \
rules/60-keyboard.rules \
+ rules/70-mouse.rules \
rules/60-persistent-storage-tape.rules \
rules/60-persistent-serial.rules \
rules/60-persistent-input.rules \
nodist_udevrules_DATA += \
rules/99-systemd.rules
-dist_udevhwdb_DATA = \
- hwdb/20-pci-vendor-model.hwdb \
- hwdb/20-pci-classes.hwdb \
- hwdb/20-usb-vendor-model.hwdb \
- hwdb/20-usb-classes.hwdb \
- hwdb/20-sdio-vendor-model.hwdb \
- hwdb/20-sdio-classes.hwdb \
- hwdb/20-bluetooth-vendor-product.hwdb \
- hwdb/20-acpi-vendor.hwdb \
- hwdb/20-OUI.hwdb \
- hwdb/20-net-ifname.hwdb \
- hwdb/60-keyboard.hwdb
-
udevconfdir = $(sysconfdir)/udev
dist_udevconf_DATA = \
src/udev/udev.conf
EXTRA_DIST += \
units/systemd-udevd.service.in \
units/systemd-udev-trigger.service.in \
- units/systemd-udev-settle.service.in \
- units/systemd-udev-hwdb-update.service.in
+ units/systemd-udev-settle.service.in
CLEANFILES += \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
- units/systemd-udev-settle.service \
- units/systemd-udev-hwdb-update.service
+ units/systemd-udev-settle.service
SOCKETS_TARGET_WANTS += \
systemd-udevd-control.socket \
SYSINIT_TARGET_WANTS += \
systemd-udevd.service \
- systemd-udev-trigger.service \
- systemd-udev-hwdb-update.service
+ systemd-udev-trigger.service
rootbin_PROGRAMS += \
udevadm
src/udev/udevadm-settle.c \
src/udev/udevadm-trigger.c \
src/udev/udevadm-test.c \
- src/udev/udevadm-test-builtin.c
+ src/udev/udevadm-test-builtin.c \
+ src/udev/udevadm-util.c \
+ src/udev/udevadm-util.h
udevadm_LDADD = \
libudev-core.la
+# ------------------------------------------------------------------------------
+if ENABLE_HWDB
+INSTALL_DIRS += \
+ $(sysconfdir)/udev/hwdb.d
+
+systemd_hwdb_SOURCES = \
+ src/libsystemd/sd-hwdb/hwdb-internal.h \
+ src/hwdb/hwdb.c
+
+systemd_hwdb_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-internal.la \
+ libudev-internal.la
+
+rootbin_PROGRAMS += \
+ systemd-hwdb
+
+dist_udevhwdb_DATA = \
+ hwdb/20-pci-vendor-model.hwdb \
+ hwdb/20-pci-classes.hwdb \
+ hwdb/20-usb-vendor-model.hwdb \
+ hwdb/20-usb-classes.hwdb \
+ hwdb/20-sdio-vendor-model.hwdb \
+ hwdb/20-sdio-classes.hwdb \
+ hwdb/20-bluetooth-vendor-product.hwdb \
+ hwdb/20-acpi-vendor.hwdb \
+ hwdb/20-OUI.hwdb \
+ hwdb/20-net-ifname.hwdb \
+ hwdb/60-keyboard.hwdb \
+ hwdb/70-mouse.hwdb
+
+EXTRA_DIST += \
+ units/systemd-hwdb-update.service.in
+
+CLEANFILES += \
+ units/systemd-hwdb-update.service
+
+SYSINIT_TARGET_WANTS += \
+ systemd-hwdb-update.service
+
# Update hwdb on installation. Do not bother if installing
# in DESTDIR, since this is likely for packaging purposes.
hwdb-update-hook:
- -test -n "$(DESTDIR)" || $(rootbindir)/udevadm hwdb --update
+ -test -n "$(DESTDIR)" || $(rootbindir)/systemd-hwdb update
INSTALL_DATA_HOOKS += \
hwdb-update-hook
hwdb-remove-hook:
-test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
+endif
# ------------------------------------------------------------------------------
TESTS += \
test_libudev_LDADD = \
libsystemd-label.la \
libudev-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
test_udev_SOURCES = \
src/test/test-udev.c
test_udev_LDADD = \
- libudev-core.la \
+ libudev-core.la \
$(BLKID_LIBS) \
$(KMOD_LIBS) \
$(SELINUX_LIBS)
src/udev/v4l_id/v4l_id.c
v4l_id_LDADD = \
- libudev-internal.la
+ libudev-internal.la \
+ libsystemd-shared.la
udevlibexec_PROGRAMS += \
v4l_id
systemd_journal_remote_LDADD += \
$(MICROHTTPD_LIBS)
+if ENABLE_SYSUSERS
+dist_sysusers_DATA += \
+ sysusers.d/systemd-remote.conf
+endif
+
+if ENABLE_TMPFILES
+dist_tmpfiles_DATA += \
+ tmpfiles.d/systemd-remote.conf
+endif
+
if HAVE_GNUTLS
systemd_journal_remote_LDADD += \
$(GNUTLS_LIBS)
$(LIBCURL_CFLAGS)
systemd_journal_upload_LDADD = \
- libsystemd-core.la \
libsystemd-internal.la \
libsystemd-journal-internal.la \
libsystemd-shared.la \
libsystemd_journal_core_la_LIBADD = \
libsystemd-journal-internal.la \
libudev-internal.la \
- libsystemd-capability.la \
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
nodist_systemunit_DATA += \
units/systemd-vconsole-setup.service
+nodist_udevrules_DATA += \
+ src/vconsole/90-vconsole.rules
+
SYSINIT_TARGET_WANTS += \
systemd-vconsole-setup.service
+
+CLEANFILES += \
+ src/vconsole/90-vconsole.rules
endif
EXTRA_DIST += \
+ src/vconsole/90-vconsole.rules.in \
units/systemd-vconsole-setup.service.in
# ------------------------------------------------------------------------------
dist_pkgsysconf_DATA += \
src/bootchart/bootchart.conf
+
+nodist_systemunit_DATA += \
+ units/systemd-bootchart.service
+
+EXTRA_DIST += \
+ units/systemd-bootchart.service.in
+
+CLEANFILES += \
+ units/systemd-bootchart.service
endif
# ------------------------------------------------------------------------------
systemd_localed_LDADD = \
libsystemd-label.la \
libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ $(XKBCOMMON_LIBS)
+
+systemd_localed_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(XKBCOMMON_CFLAGS)
nodist_systemunit_DATA += \
units/systemd-localed.service
libsystemd-resolve.la \
libsystemd-network.la \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la \
-lm
systemd-machined
libsystemd_machine_core_la_SOURCES = \
- src/machine/machined-dbus.c \
src/machine/machine.c \
src/machine/machine.h \
- src/machine/machine-dbus.c
+ src/machine/machined-dbus.c \
+ src/machine/machine-dbus.c \
+ src/machine/machine-dbus.h \
+ src/machine/image-dbus.c \
+ src/machine/image-dbus.h
libsystemd_machine_core_la_LIBADD = \
libsystemd-label.la \
dist_dbuspolicy_DATA += \
src/machine/org.freedesktop.machine1.conf
+polkitpolicy_files += \
+ src/machine/org.freedesktop.machine1.policy
+
+polkitpolicy_in_files += \
+ src/machine/org.freedesktop.machine1.policy.in
+
dist_zshcompletion_DATA += \
shell-completion/zsh/_machinectl \
shell-completion/zsh/_sd_machines
lib_LTLIBRARIES += \
libnss_mymachines.la
+
+if HAVE_LIBCURL
+
+bin_PROGRAMS += \
+ systemd-import
+
+systemd_import_SOURCES = \
+ src/import/import.c \
+ src/import/import-gpt.c \
+ src/import/import-gpt.h \
+ src/import/import-dkr.c \
+ src/import/import-dkr.h \
+ src/import/curl-util.c \
+ src/import/curl-util.h \
+ src/import/aufs-util.c \
+ src/import/aufs-util.h
+
+systemd_import_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(LIBCURL_CFLAGS)
+
+systemd_import_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la \
+ $(LIBCURL_LIBS) \
+ -lm
+endif
+
endif
# ------------------------------------------------------------------------------
src/resolve/resolved-gperf.c
systemd_resolved_LDADD = \
- libsystemd-capability.la \
libsystemd-network.la \
libsystemd-label.la \
libsystemd-internal.la \
src/resolve/test-dns-domain.c
test_dns_domain_LDADD = \
- libsystemd-capability.la \
libsystemd-network.la \
libsystemd-label.la \
libsystemd-internal.la \
src/network/networkd.c
systemd_networkd_LDADD = \
- libsystemd-networkd-core.la \
- libsystemd-capability.la
+ libsystemd-networkd-core.la
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
src/network/networkd-link.c \
src/network/networkd-ipv4ll.c \
src/network/networkd-dhcp4.c \
+ src/network/networkd-dhcp6.c \
src/network/networkd-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
src/network/networkd-manager.c \
+ src/network/networkd-fdb.c \
src/network/networkd-address-pool.c
nodist_libsystemd_networkd_core_la_SOURCES = \
test_network_SOURCES = \
src/network/test-network.c
-test_network_CFLAGS = \
- $(AM_CFLAGS)
-
test_network_LDADD = \
libsystemd-networkd-core.la
libsystemd_logind_core_la_LIBADD = \
libsystemd-label.la \
- libsystemd-capability.la \
libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la
loginctl_SOURCES = \
src/login/loginctl.c \
+ src/login/sysfs-show.h \
src/login/sysfs-show.c
loginctl_LDADD = \
-Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym
pam_systemd_la_LIBADD = \
- libsystemd-capability.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(PAM_LIBS)
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
+sysusers.d/%: sysusers.d/%.m4
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
+
tmpfiles.d/%: tmpfiles.d/%.m4
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
-units/user/%: units/%.m4
+units/user/%: units/user/%.m4
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
CLEANFILES += \
$(nodist_systemunit_DATA) \
$(nodist_userunit_DATA) \
- $(pkgconfigdata_DATA) \
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA)
rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
-.PHONY: tango
-tango: upload
+.PHONY: gardel
+gardel: upload
+ scp man/*.html gardel:public/systemd-man/
+
+.PHONY: lennart-fedora
+lennart-fedora:
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
- scp man/*.html tango:public/systemd-man/
.PHONY: install-tree
install-tree: all
~ianmdlvl / elogind.git / blobdiff