chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zsh-completion: Do not interpret escape sequences in _filter_units_by_property
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index ce5ebf7c4829aeeb2e00e1b3c3a77766be4fcc61..406910a3c2ff3561c5eb495b5d7029f7fc25e48c 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-148,6
+148,8
@@
check_PROGRAMS =
check_DATA =
tests=
manual_tests =
check_DATA =
tests=
manual_tests =
+TEST_EXTENSIONS = .py
+PY_LOG_COMPILER = $(PYTHON)
if ENABLE_TESTS
noinst_PROGRAMS = $(manual_tests) $(tests)
TESTS = $(tests)
if ENABLE_TESTS
noinst_PROGRAMS = $(manual_tests) $(tests)
TESTS = $(tests)
@@
-3766,7
+3768,14
@@
endif
# ------------------------------------------------------------------------------
TESTS += \
test/udev-test.pl \
# ------------------------------------------------------------------------------
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 \
manual_tests += \
test-libudev \
@@
-3810,8
+3819,10
@@
DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
EXTRA_DIST += \
test/sys.tar.xz \
test/udev-test.pl \
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 = \
# ------------------------------------------------------------------------------
ata_id_SOURCES = \
@@
-5237,6
+5248,9
@@
lib_LTLIBRARIES += \
libnss_mymachines.la
if HAVE_LIBCURL
libnss_mymachines.la
if HAVE_LIBCURL
+if HAVE_XZ
+if HAVE_ZLIB
+if HAVE_GCRYPT
bin_PROGRAMS += \
systemd-import
bin_PROGRAMS += \
systemd-import
@@
-5245,8
+5259,14
@@
systemd_import_SOURCES = \
src/import/import.c \
src/import/import-raw.c \
src/import/import-raw.h \
src/import/import.c \
src/import/import-raw.c \
src/import/import-raw.h \
+ src/import/import-tar.c \
+ src/import/import-tar.h \
src/import/import-dkr.c \
src/import/import-dkr.h \
src/import/import-dkr.c \
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/curl-util.c \
src/import/curl-util.h \
src/import/aufs-util.c \
src/import/curl-util.c \
src/import/curl-util.h \
src/import/aufs-util.c \
@@
-5258,7
+5278,10
@@
systemd_import_CFLAGS = \
$(AM_CFLAGS) \
$(LIBCURL_CFLAGS) \
$(XZ_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 = \
libsystemd-internal.la \
systemd_import_LDADD = \
libsystemd-internal.la \
@@
-5266,11
+5289,9
@@
systemd_import_LDADD = \
libsystemd-shared.la \
$(LIBCURL_LIBS) \
$(XZ_LIBS) \
libsystemd-shared.la \
$(LIBCURL_LIBS) \
$(XZ_LIBS) \
- $(ZLIB_LIBS)
-
-endif
+ $(ZLIB_LIBS) \
+ $(GCRYPT_LIBS)
-if HAVE_ZLIB
manual_tests += \
test-qcow2
manual_tests += \
test-qcow2
@@
-5285,8
+5306,15
@@
test_qcow2_CFLAGS = \
test_qcow2_LDADD = \
libsystemd-internal.la \
test_qcow2_LDADD = \
libsystemd-internal.la \
+ libsystemd-label.la \
libsystemd-shared.la \
$(ZLIB_LIBS)
libsystemd-shared.la \
$(ZLIB_LIBS)
+
+dist_rootlibexec_DATA = \
+ src/import/import-pubring.gpg
+endif
+endif
+endif
endif
endif
endif
endif
@@
-5480,6
+5508,7
@@
libsystemd_networkd_core_la_SOURCES = \
src/network/networkd-netdev-vxlan.h \
src/network/networkd-netdev-vlan.h \
src/network/networkd-netdev-macvlan.h \
src/network/networkd-netdev-vxlan.h \
src/network/networkd-netdev-vlan.h \
src/network/networkd-netdev-macvlan.h \
+ src/network/networkd-netdev-ipvlan.h \
src/network/networkd-netdev-dummy.h \
src/network/networkd-netdev-tuntap.h \
src/network/networkd-netdev-bond.h \
src/network/networkd-netdev-dummy.h \
src/network/networkd-netdev-tuntap.h \
src/network/networkd-netdev-bond.h \
@@
-5490,6
+5519,7
@@
libsystemd_networkd_core_la_SOURCES = \
src/network/networkd-netdev-vxlan.c \
src/network/networkd-netdev-vlan.c \
src/network/networkd-netdev-macvlan.c \
src/network/networkd-netdev-vxlan.c \
src/network/networkd-netdev-vlan.c \
src/network/networkd-netdev-macvlan.c \
+ src/network/networkd-netdev-ipvlan.c \
src/network/networkd-netdev-dummy.c \
src/network/networkd-netdev-tuntap.c \
src/network/networkd-netdev-bond.c \
src/network/networkd-netdev-dummy.c \
src/network/networkd-netdev-tuntap.c \
src/network/networkd-netdev-bond.c \
@@
-6647,3
+6677,9
@@
git-contrib:
EXTRA_DIST += \
tools/gdb-sd_dump_hashmaps.py
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 -