X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=c463f2353e2de9ea92fe662a50f1e3985b83cfa3;hp=f165042cb02bd31dca62bcc67183c98d9ed816c0;hb=fa639f3ae770ffccdd9f97430b0883d01bc821ce;hpb=56ebfaf1ca185a93ffb372b6e1a1fa3a957d93cd diff --git a/Makefile.am b/Makefile.am index f165042cb..c463f2353 100644 --- a/Makefile.am +++ b/Makefile.am @@ -148,8 +148,9 @@ check_PROGRAMS = check_DATA = tests= manual_tests = +TEST_EXTENSIONS = .py +PY_LOG_COMPILER = $(PYTHON) if ENABLE_TESTS -export PYTHON noinst_PROGRAMS = $(manual_tests) $(tests) TESTS = $(tests) else @@ -901,7 +902,9 @@ libsystemd_shared_la_SOURCES = \ src/shared/verbs.h \ src/shared/sigbus.c \ src/shared/sigbus.h \ - src/shared/build.h + src/shared/build.h \ + src/shared/import-util.c \ + src/shared/import-util.h if HAVE_UTMP libsystemd_shared_la_SOURCES += \ @@ -2190,6 +2193,11 @@ systemd_tmpfiles_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +if HAVE_ACL +systemd_tmpfiles_LDADD += \ + libsystemd-acl.la +endif + rootbin_PROGRAMS += \ systemd-tmpfiles @@ -3186,6 +3194,8 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/dhcp6-option.c \ src/libsystemd-network/dhcp6-lease-internal.h \ src/libsystemd-network/sd-dhcp6-lease.c \ + 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 \ @@ -3258,7 +3268,9 @@ test_icmp6_rs_SOURCES = \ src/systemd/sd-dhcp6-client.h \ src/systemd/sd-icmp6-nd.h \ src/libsystemd-network/dhcp6-internal.h \ - src/libsystemd-network/test-icmp6-rs.c + src/libsystemd-network/test-icmp6-rs.c \ + src/libsystemd-network/dhcp-identifier.h \ + src/libsystemd-network/dhcp-identifier.c test_icmp6_rs_LDADD = \ libsystemd-network.la \ @@ -3268,7 +3280,9 @@ test_icmp6_rs_LDADD = \ test_dhcp6_client_SOURCES = \ src/systemd/sd-dhcp6-client.h \ src/libsystemd-network/dhcp6-internal.h \ - src/libsystemd-network/test-dhcp6-client.c + src/libsystemd-network/test-dhcp6-client.c \ + src/libsystemd-network/dhcp-identifier.h \ + src/libsystemd-network/dhcp-identifier.c test_dhcp6_client_LDADD = \ libsystemd-network.la \ @@ -3767,7 +3781,14 @@ endif # ------------------------------------------------------------------------------ TESTS += \ test/udev-test.pl \ - test/rules-test.sh + $(NULL) + +if HAVE_PYTHON +TESTS += \ + test/rule-syntax-check.py \ + test/sysv-generator-test.py \ + $(NULL) +endif manual_tests += \ test-libudev \ @@ -3811,8 +3832,10 @@ DISTCLEAN_LOCAL_HOOKS += test-sys-distclean EXTRA_DIST += \ test/sys.tar.xz \ test/udev-test.pl \ - test/rules-test.sh \ - test/rule-syntax-check.py + test/rule-syntax-check.py \ + test/sysv-generator-test.py \ + $(NULL) + # ------------------------------------------------------------------------------ ata_id_SOURCES = \ @@ -5237,13 +5260,35 @@ libnss_mymachines_la_LIBADD = \ lib_LTLIBRARIES += \ libnss_mymachines.la +endif + +# ------------------------------------------------------------------------------ +if ENABLE_IMPORTD + if HAVE_LIBCURL +if HAVE_XZ +if HAVE_ZLIB +if HAVE_BZIP2 +if HAVE_GCRYPT -bin_PROGRAMS += \ - systemd-import +rootlibexec_PROGRAMS += \ + systemd-importd \ + systemd-pull + +systemd_importd_SOURCES = \ + src/import/importd.c + +systemd_importd_CFLAGS = \ + $(AM_CFLAGS) \ + -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" -systemd_import_SOURCES = \ - src/import/import.c \ +systemd_importd_LDADD = \ + libsystemd-internal.la \ + libsystemd-label.la \ + libsystemd-shared.la + +systemd_pull_SOURCES = \ + src/import/pull.c \ src/import/import-raw.c \ src/import/import-raw.h \ src/import/import-tar.c \ @@ -5252,8 +5297,8 @@ systemd_import_SOURCES = \ src/import/import-dkr.h \ src/import/import-job.c \ src/import/import-job.h \ - src/import/import-util.c \ - src/import/import-util.h \ + src/import/import-common.c \ + src/import/import-common.h \ src/import/curl-util.c \ src/import/curl-util.h \ src/import/aufs-util.c \ @@ -5261,23 +5306,55 @@ systemd_import_SOURCES = \ src/import/qcow2-util.c \ src/import/qcow2-util.h -systemd_import_CFLAGS = \ +systemd_pull_CFLAGS = \ $(AM_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(XZ_CFLAGS) \ - $(ZLIB_CFLAGS) + $(ZLIB_CFLAGS) \ + $(GCRYPT_CFLAGS) \ + -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \ + -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\" -systemd_import_LDADD = \ +systemd_pull_LDADD = \ libsystemd-internal.la \ libsystemd-label.la \ libsystemd-shared.la \ $(LIBCURL_LIBS) \ $(XZ_LIBS) \ - $(ZLIB_LIBS) + $(ZLIB_LIBS) \ + -lbz2 \ + $(GCRYPT_LIBS) -endif +dist_rootlibexec_DATA = \ + src/import/import-pubring.gpg + +nodist_systemunit_DATA += \ + units/systemd-importd.service + +EXTRA_DIST += \ + units/systemd-importd.service.in + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.import1.busname + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.import1.busname + +SYSTEM_UNIT_ALIASES += \ + systemd-importd.service dbus-org.freedesktop.import1.service + +dist_dbussystemservice_DATA += \ + src/import/org.freedesktop.import1.service + +dist_dbuspolicy_DATA += \ + src/import/org.freedesktop.import1.conf + +polkitpolicy_files += \ + src/import/org.freedesktop.import1.policy + +polkitpolicy_in_files += \ + src/import/org.freedesktop.import1.policy.in -if HAVE_ZLIB manual_tests += \ test-qcow2 @@ -5295,6 +5372,11 @@ test_qcow2_LDADD = \ libsystemd-label.la \ libsystemd-shared.la \ $(ZLIB_LIBS) + +endif +endif +endif +endif endif endif @@ -6138,6 +6220,7 @@ substitutions = \ '|rootprefix=$(rootprefix)|' \ '|udevlibexecdir=$(udevlibexecdir)|' \ '|SUSHELL=$(SUSHELL)|' \ + '|SULOGIN=$(SULOGIN)|' \ '|DEBUGTTY=$(DEBUGTTY)|' \ '|KILL=$(KILL)|' \ '|KMOD=$(KMOD)|' \ @@ -6657,3 +6740,9 @@ git-contrib: EXTRA_DIST += \ tools/gdb-sd_dump_hashmaps.py + +list-keys: + gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --list-keys + +add-key: + gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import -