test: fix some tests when running inside a container

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 46a838d4a7f224d188cca8d90d2b6006c0802a39..23210ff33edb09a03297c15caf6042bd297762da 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -385,6 +385,7 @@ rootlibexec_PROGRAMS = \
        systemd-remount-fs \
        systemd-reply-password \
        systemd-fsck \
+       systemd-machine-id-commit \
        systemd-ac-power \
        systemd-sysctl \
        systemd-sleep \
@@ -536,6 +537,7 @@ nodist_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 \
@@ -588,7 +590,8 @@ EXTRA_DIST += \
        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 \
@@ -860,6 +863,8 @@ libsystemd_shared_la_SOURCES = \
        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 \
@@ -900,7 +905,9 @@ nodist_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) \
@@ -1188,8 +1195,10 @@ CLEANFILES += \
        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 \
@@ -1198,6 +1207,8 @@ BUILT_SOURCES += \
        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
 
@@ -1223,6 +1234,7 @@ src/shared/af-list.txt:
 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_//' >$@
@@ -1234,6 +1246,20 @@ src/shared/arphrd-from-name.gperf: src/shared/arphrd-list.txt
        $(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, $$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' <$< >$@
@@ -1350,7 +1376,8 @@ tests += \
        test-bus-policy \
        test-locale-util \
        test-execute \
-       test-copy
+       test-copy \
+       test-cap-list
 
 EXTRA_DIST += \
        test/a.service \
@@ -1576,6 +1603,12 @@ test_uid_range_SOURCES = \
 test_uid_range_LDADD = \
        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
 
@@ -2215,6 +2248,20 @@ systemd_fsck_LDADD = \
        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
@@ -2562,9 +2609,16 @@ dist_userunit_DATA += \
 endif
 
 EXTRA_DIST += \
-       units/systemd-bus-proxyd@.service.in \
+       units/systemd-bus-proxyd@.service.m4.in \
        units/user/systemd-bus-proxyd@.service.in
 
+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
@@ -2765,6 +2819,7 @@ tests += \
        test-bus-gvariant \
        test-event \
        test-rtnl \
+       test-local-addresses \
        test-resolve
 
 bin_PROGRAMS += \
@@ -2923,6 +2978,13 @@ test_rtnl_LDADD = \
        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
 
@@ -4453,14 +4515,18 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
        units/systemd-vconsole-setup.service
 
-dist_udevrules_DATA += \
+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
 
 # ------------------------------------------------------------------------------
@@ -4482,6 +4548,15 @@ rootlibexec_PROGRAMS += \
 
 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
 
 # ------------------------------------------------------------------------------