X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=84b587ddb2c3e9d345e20b73549c64cf30f9546d;hp=2efd0333fe8406f772dd7909ea815f43f93784af;hb=0f5a314b2ec348c241e4a484ee505bbd2eddb19e;hpb=3fb394369ccd6787f8f883e0f81dc7f35cb1ec51 diff --git a/Makefile.am b/Makefile.am index 2efd0333f..84b587ddb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,7 @@ SUBDIRS = . po .PRECIOUS: $(TEST_SUITE_LOG) Makefile LIBUDEV_CURRENT=7 -LIBUDEV_REVISION=1 +LIBUDEV_REVISION=2 LIBUDEV_AGE=6 LIBGUDEV_CURRENT=2 @@ -47,7 +47,7 @@ LIBGUDEV_REVISION=0 LIBGUDEV_AGE=2 LIBSYSTEMD_CURRENT=5 -LIBSYSTEMD_REVISION=0 +LIBSYSTEMD_REVISION=1 LIBSYSTEMD_AGE=5 # The following four libraries only exist for compatibility reasons, @@ -217,6 +217,7 @@ AM_CPPFLAGS = \ -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) @@ -537,6 +538,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 \ @@ -589,7 +591,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 \ @@ -755,8 +758,6 @@ libsystemd_shared_la_SOURCES = \ 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 \ @@ -861,6 +862,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 \ @@ -888,7 +891,9 @@ libsystemd_shared_la_SOURCES = \ 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 if HAVE_UTMP libsystemd_shared_la_SOURCES += \ @@ -901,7 +906,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) \ @@ -1189,8 +1196,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 \ @@ -1199,6 +1208,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 @@ -1224,6 +1235,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 - $@ @@ -1235,6 +1247,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 - $@ + +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' <$< >$@ @@ -1295,7 +1321,8 @@ manual_tests += \ test-install \ test-watchdog \ test-log \ - test-ipcrm + test-ipcrm \ + test-btrfs if HAVE_KMOD manual_tests += \ @@ -1351,7 +1378,8 @@ tests += \ test-bus-policy \ test-locale-util \ test-execute \ - test-copy + test-copy \ + test-cap-list EXTRA_DIST += \ test/a.service \ @@ -1418,6 +1446,8 @@ EXTRA_DIST += \ 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 \ @@ -1577,6 +1607,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 @@ -1723,6 +1759,12 @@ test_ipcrm_LDADD = \ 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 @@ -2227,6 +2269,9 @@ systemd_machine_id_commit_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +SYSINIT_TARGET_WANTS += \ + systemd-machine-id-commit.service + # ------------------------------------------------------------------------------ systemd_ac_power_SOURCES = \ src/ac-power/ac-power.c @@ -2388,8 +2433,8 @@ systemd_dbus1_generator_SOURCES = \ 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) @@ -2574,9 +2619,19 @@ 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 +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 @@ -2599,11 +2654,14 @@ libsystemd_internal_la_SOURCES = \ 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 \ @@ -2657,7 +2715,10 @@ libsystemd_internal_la_SOURCES = \ 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 @@ -2777,6 +2838,7 @@ tests += \ test-bus-gvariant \ test-event \ test-rtnl \ + test-local-addresses \ test-resolve bin_PROGRAMS += \ @@ -2801,8 +2863,8 @@ 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 @@ -2935,6 +2997,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 @@ -3110,15 +3179,15 @@ nodist_userunit_DATA += \ 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) @@ -3263,7 +3332,6 @@ libudev_la_SOURCES =\ 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 = \ @@ -3547,7 +3615,8 @@ test_libudev_SOURCES = \ 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 @@ -4465,14 +4534,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 # ------------------------------------------------------------------------------ @@ -4494,6 +4567,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 # ------------------------------------------------------------------------------ @@ -5184,6 +5266,7 @@ libsystemd_networkd_core_la_SOURCES = \ 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 \ @@ -5882,7 +5965,7 @@ units/%: units/%.m4 $(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 < $< > $@ @@ -6192,10 +6275,13 @@ doc-sync: all destdir-sphinx 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