tmpfiles: add 'a' type to set ACLs

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 406910a3c2ff3561c5eb495b5d7029f7fc25e48c..440ba888a0afd228868bff2b77c2f5bf0a02b7a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -902,7 +902,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/verbs.h \
        src/shared/sigbus.c \
        src/shared/sigbus.h \
        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 += \
 
 if HAVE_UTMP
 libsystemd_shared_la_SOURCES += \


@@ -2191,6 +2193,11 @@ systemd_tmpfiles_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
        libsystemd-internal.la \
        libsystemd-shared.la
 

+if HAVE_ACL
+systemd_tmpfiles_LDADD += \
+       libsystemd-acl.la
+endif
+

 rootbin_PROGRAMS += \
        systemd-tmpfiles
 
 rootbin_PROGRAMS += \
        systemd-tmpfiles
 


@@ -3187,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/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 \
        src/libsystemd-network/lldp.h \
        src/libsystemd-network/lldp-tlv.h \
        src/libsystemd-network/lldp-tlv.c \


@@ -3259,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/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 \
 
 test_icmp6_rs_LDADD = \
        libsystemd-network.la \


@@ -3269,7 +3280,9 @@ test_icmp6_rs_LDADD = \
 test_dhcp6_client_SOURCES = \
        src/systemd/sd-dhcp6-client.h \
        src/libsystemd-network/dhcp6-internal.h \
 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 \
 
 test_dhcp6_client_LDADD = \
        libsystemd-network.la \


@@ -5247,14 +5260,35 @@ libnss_mymachines_la_LIBADD = \
 lib_LTLIBRARIES += \
        libnss_mymachines.la
 
 lib_LTLIBRARIES += \
        libnss_mymachines.la
 

+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_IMPORTD
+

 if HAVE_LIBCURL
 if HAVE_XZ
 if HAVE_ZLIB
 if HAVE_LIBCURL
 if HAVE_XZ
 if HAVE_ZLIB

+if HAVE_BZIP2

 if HAVE_GCRYPT
 
 if HAVE_GCRYPT
 

-bin_PROGRAMS += \
+rootlibexec_PROGRAMS += \
+       systemd-importd \

        systemd-import
 
        systemd-import
 

+systemd_importd_SOURCES = \
+       src/import/importd.c \
+       src/import/importd.h
+
+systemd_importd_CFLAGS = \
+       $(AM_CFLAGS) \
+       -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \
+       -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
+       -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
+
+systemd_importd_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+

 systemd_import_SOURCES = \
        src/import/import.c \
        src/import/import-raw.c \
 systemd_import_SOURCES = \
        src/import/import.c \
        src/import/import-raw.c \


@@ -5265,8 +5299,8 @@ systemd_import_SOURCES = \
        src/import/import-dkr.h \
        src/import/import-job.c \
        src/import/import-job.h \
        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 \
        src/import/curl-util.c \
        src/import/curl-util.h \
        src/import/aufs-util.c \


@@ -5290,8 +5324,39 @@ systemd_import_LDADD = \
        $(LIBCURL_LIBS) \
        $(XZ_LIBS) \
        $(ZLIB_LIBS) \
        $(LIBCURL_LIBS) \
        $(XZ_LIBS) \
        $(ZLIB_LIBS) \

+       -lbz2 \

        $(GCRYPT_LIBS)
 
        $(GCRYPT_LIBS)
 

+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
+

 manual_tests += \
        test-qcow2
 
 manual_tests += \
        test-qcow2
 


@@ -5310,8 +5375,7 @@ test_qcow2_LDADD = \
        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