diff options
25 files changed, 194 insertions, 133 deletions
diff --git a/Makefile.am b/Makefile.am index fbdd1a75c6..c3fb64acd8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -#@build-aux/Makefile.once.head/20-systemd.mk +#@build-aux/Makefile.once.head/20-sd.mk ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AM_MAKEFLAGS = --no-print-directory AUTOMAKE_OPTIONS = color-tests parallel-tests @@ -347,7 +347,7 @@ INSTALL_EXEC_HOOKS += \ INSTALL_EXEC_HOOKS += \ install-busnames-target-wants-hook -#@build-aux/Makefile.once.head/20-systemd.mk ----------------------------------- +#@build-aux/Makefile.once.head/20-sd.mk ---------------------------------------- V ?= AM_V_M4 = $(AM_V_M4_$(V)) @@ -821,7 +821,7 @@ EXTRA_DIST += \ man/glib-event-glue.c #@src/libbasic/Makefile -------------------------------------------------------- -at.subdirs += src include +nested.subdirs += src include #@src/libbasic/src/Makefile noinst_LTLIBRARIES += \ libbasic.la @@ -1041,7 +1041,7 @@ libbasic_la_LIBADD = \ -lm #@src/libshared/Makefile ------------------------------------------------------- -at.subdirs += src +nested.subdirs += src #@src/libshared/src/Makefile noinst_LTLIBRARIES += \ libshared.la @@ -1360,7 +1360,7 @@ EXTRA_DIST += \ CLEANFILES += \ $(gperf_txt_sources) -#@build-aux/Makefile.each.tail/20-systemd.mk +#@build-aux/Makefile.each.tail/20-sd.mk %-from-name.gperf: %-list.txt $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@ @@ -1370,7 +1370,7 @@ CLEANFILES += \ $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@ #@src/libbasic/include/Makefile -at.subdirs += basic +nested.subdirs += basic #@src/libbasic/include/basic/Makefile src/basic/errno-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -2798,6 +2798,7 @@ dist_zshcompletion_data += \ shell-completion/zsh/_bootctl endif # HAVE_BLKID endif # ENABLE_EFI + #@auto/systemd-boot/Makefile --------------------------------------------------- if ENABLE_EFI if HAVE_GNUEFI @@ -3493,7 +3494,7 @@ busctl_LDADD = \ libshared.la #@src/libsystemd-network/Makefile ---------------------------------------------- -at.subdirs += src test +nested.subdirs += src test #@src/libsystemd-network/src/Makefile noinst_LTLIBRARIES += \ libsystemd-network.la @@ -6018,7 +6019,7 @@ EXTRA_DIST += \ test/loopy.service.d \ test/loopy.service.d/compat.conf -#@build-aux/Makefile.once.head/20-systemd.mk ----------------------------------- +#@build-aux/Makefile.once.head/20-sd.mk ---------------------------------------- substitutions = \ '|rootlibexecdir=$(rootlibexecdir)|' \ '|rootbindir=$(rootbindir)|' \ @@ -6093,7 +6094,7 @@ units/%: units/%.in man/%: man/%.in $(SED_PROCESS) -#@build-aux/Makefile.each.tail/20-systemd.mk +#@build-aux/Makefile.each.tail/20-sd.mk sysctl.d/%: sysctl.d/%.in $(SED_PROCESS) @@ -6119,7 +6120,7 @@ shell-completion/%: shell-completion/%.in %.conf: %.conf.in $(SED_PROCESS) -#@build-aux/Makefile.each.tail/20-systemd.mk +#@build-aux/Makefile.each.tail/20-sd.mk %.sh: %.sh.in $(SED_PROCESS) $(AM_V_GEN)chmod +x $@ @@ -6160,16 +6161,18 @@ EXTRA_DIST += \ $(polkitpolicy_in_files) \ $(polkitpolicy_in_in_files) -# ------------------------------------------------------------------------------ +#@man/Makefile ----------------------------------------------------------------- man/custom-entities.ent: configure.ac $(AM_V_GEN)$(MKDIR_P) $(dir $@) $(AM_V_GEN)(echo '<?xml version="1.0" encoding="utf-8" ?>' && \ printf '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">\n,$(substitutions))))') \ > $@ # ' +#@discard.mk CLEANFILES += \ man/custom-entities.ent +#@build-aux/Makefile.once.head/20-sd.mk XSLTPROC_FLAGS = \ --nonet \ --xinclude \ @@ -6187,6 +6190,7 @@ XSLTPROC_PROCESS_MAN = \ XSLTPROC_PROCESS_HTML = \ $(AM_V_XSLT)$(XSLT) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< +#@build-aux/Makefile.each.tail/20-sd.mk man/%.1: man/%.xml man/custom-man.xsl man/custom-entities.ent $(XSLTPROC_PROCESS_MAN) @@ -6205,10 +6209,12 @@ man/%.8: man/%.xml man/custom-man.xsl man/custom-entities.ent man/%.html: man/%.xml man/custom-html.xsl man/custom-entities.ent $(XSLTPROC_PROCESS_HTML) +#@build-aux/Makefile.once.head/20-sd.mk define html-alias $(AM_V_LN)$(LN_S) -f $(notdir $<) $@ endef +#@discard.mk EXTRA_DIST += \ man/custom-html.xsl \ man/custom-man.xsl @@ -6438,7 +6444,7 @@ install-tree: all $(MAKE) install DESTDIR=$(abs_srcdir)/install-tree tree $(abs_srcdir)/install-tree -#@build-aux/Makefile.once.tail/20-systemd.mk +#@build-aux/Makefile.once.tail/20-sd.mk # Let's run all tests of the test suite, but under valgrind. Let's # exclude perl/python/shell scripts we have in there .PHONY: valgrind-tests @@ -6491,7 +6497,7 @@ check-includes: $(top_srcdir)/tools/check-includes.pl EXTRA_DIST += \ $(top_srcdir)/tools/check-includes.pl -#@build-aux/Makefile.once.head/20-systemd.mk +#@build-aux/Makefile.once.head/20-sd.mk # Stupid test that everything purported to be exported really is define generate-sym-test $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -6551,7 +6557,7 @@ tests += \ test-libsystemd-sym \ test-libudev-sym -#@build-aux/Makefile.once.tail/20-systemd.mk +#@build-aux/Makefile.once.tail/20-sd.mk .PHONY: cppcheck cppcheck: cppcheck --enable=all -q $(top_srcdir) @@ -6574,35 +6580,35 @@ add-key: #@src/Makefile #@src/libudev/Makefile -at.subdirs += src +nested.subdirs += src #@src/libsystemd/src/subdir.mk systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" #@src/grp-boot/Makefile -at.subdirs += bootctl systemd-boot +nested.subdirs += bootctl systemd-boot #@src/grp-coredump/Makefile -at.subdirs += coredumpctl systemd-coredump +nested.subdirs += coredumpctl systemd-coredump #@src/grp-machine/Makefile -at.subdirs += machinectl systemd-machined -at.subdirs += nss-mymachines +nested.subdirs += machinectl systemd-machined +nested.subdirs += nss-mymachines #@src/grp-journal/grp-remote/Makefile -at.subdirs += systemd-journa-gatewayd -at.subdirs += systemd-journa-remote -at.subdirs += systemd-journa-upload +nested.subdirs += systemd-journa-gatewayd +nested.subdirs += systemd-journa-remote +nested.subdirs += systemd-journa-upload #@src/grp-resolve/Makefile -at.subdirs += systemd-resolved nss-resolve +nested.subdirs += systemd-resolved nss-resolve #@src/grp-system/Makefile -at.subdirs += systemctl systemd +nested.subdirs += systemctl systemd #@src/grp-timedate/Makefile -at.subdirs += timedatectl systemd-timedated +nested.subdirs += timedatectl systemd-timedated #@all include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-sd.mk index 72dbec6714..a7087f6568 100644 --- a/build-aux/Makefile.each.tail/20-systemd.mk +++ b/build-aux/Makefile.each.tail/20-sd.mk @@ -46,4 +46,22 @@ $(outdir)/%: src/%.m4 $(top_builddir)/config.status $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ +$(outdir)/%.1: man/%.xml man/custom-man.xsl man/custom-entities.ent + $(XSLTPROC_PROCESS_MAN) + +$(outdir)/%.3: man/%.xml man/custom-man.xsl man/custom-entities.ent + $(XSLTPROC_PROCESS_MAN) + +$(outdir)/%.5: man/%.xml man/custom-man.xsl man/custom-entities.ent + $(XSLTPROC_PROCESS_MAN) + +$(outdir)/%.7: man/%.xml man/custom-man.xsl man/custom-entities.ent + $(XSLTPROC_PROCESS_MAN) + +$(outdir)/%.8: man/%.xml man/custom-man.xsl man/custom-entities.ent + $(XSLTPROC_PROCESS_MAN) + +$(outdir)/%.html: man/%.xml man/custom-html.xsl man/custom-entities.ent + $(XSLTPROC_PROCESS_HTML) + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-sd.mk index 3f55d88234..407dde14c4 100644 --- a/build-aux/Makefile.once.head/20-systemd.mk +++ b/build-aux/Makefile.once.head/20-sd.mk @@ -171,6 +171,27 @@ SED_PROCESS = \ $(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \ < $< > $@ +XSLTPROC_FLAGS = \ + --nonet \ + --xinclude \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + --stringparam systemd.version $(VERSION) \ + --path '$(builddir)/man:$(srcdir)/man' + +XSLT = $(if $(XSLTPROC), $(XSLTPROC), xsltproc) +XSLTPROC_PROCESS_MAN = \ + $(AM_V_XSLT)$(XSLT) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-man.xsl $< + +XSLTPROC_PROCESS_HTML = \ + $(AM_V_XSLT)$(XSLT) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< + +define html-alias + $(AM_V_LN)$(LN_S) -f $(notdir $<) $@ +endef + # Stupid test that everything purported to be exported really is define generate-sym-test $(AM_V_at)$(MKDIR_P) $(dir $@) diff --git a/build-aux/Makefile.once.tail/20-systemd.mk b/build-aux/Makefile.once.tail/20-sd.mk index 7455244e3c..7455244e3c 100644 --- a/build-aux/Makefile.once.tail/20-systemd.mk +++ b/build-aux/Makefile.once.tail/20-sd.mk diff --git a/discard.mk b/discard.mk index 42759a0d3b..aa2e6c1c8b 100644 --- a/discard.mk +++ b/discard.mk @@ -863,55 +863,9 @@ EXTRA_DIST += \ $(polkitpolicy_in_files) \ $(polkitpolicy_in_in_files) -# ------------------------------------------------------------------------------ -$(outdir)/custom-entities.ent: configure.ac - $(AM_V_GEN)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)(echo '<?xml version="1.0" encoding="utf-8" ?>' && \ - printf '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">\n,$(substitutions))))') \ - > $@ # ' - CLEANFILES += \ man/custom-entities.ent -XSLTPROC_FLAGS = \ - --nonet \ - --xinclude \ - --stringparam man.output.quietly 1 \ - --stringparam funcsynopsis.style ansi \ - --stringparam man.authors.section.enabled 0 \ - --stringparam man.copyright.section.enabled 0 \ - --stringparam systemd.version $(VERSION) \ - --path '$(builddir)/man:$(srcdir)/man' - -XSLT = $(if $(XSLTPROC), $(XSLTPROC), xsltproc) -XSLTPROC_PROCESS_MAN = \ - $(AM_V_XSLT)$(XSLT) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-man.xsl $< - -XSLTPROC_PROCESS_HTML = \ - $(AM_V_XSLT)$(XSLT) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< - -$(outdir)/%.1: man/%.xml man/custom-man.xsl man/custom-entities.ent - $(XSLTPROC_PROCESS_MAN) - -$(outdir)/%.3: man/%.xml man/custom-man.xsl man/custom-entities.ent - $(XSLTPROC_PROCESS_MAN) - -$(outdir)/%.5: man/%.xml man/custom-man.xsl man/custom-entities.ent - $(XSLTPROC_PROCESS_MAN) - -$(outdir)/%.7: man/%.xml man/custom-man.xsl man/custom-entities.ent - $(XSLTPROC_PROCESS_MAN) - -$(outdir)/%.8: man/%.xml man/custom-man.xsl man/custom-entities.ent - $(XSLTPROC_PROCESS_MAN) - -$(outdir)/%.html: man/%.xml man/custom-html.xsl man/custom-entities.ent - $(XSLTPROC_PROCESS_HTML) - -define html-alias - $(AM_V_LN)$(LN_S) -f $(notdir $<) $@ -endef - EXTRA_DIST += \ man/custom-html.xsl \ man/custom-man.xsl diff --git a/man/Makefile b/man/Makefile new file mode 100644 index 0000000000..edba211499 --- /dev/null +++ b/man/Makefile @@ -0,0 +1,32 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +$(outdir)/custom-entities.ent: configure.ac + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)(echo '<?xml version="1.0" encoding="utf-8" ?>' && \ + printf '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">\n,$(substitutions))))') \ + > $@ # ' + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-boot/Makefile b/src/grp-boot/Makefile index 922d8a32d3..418f942c0a 100644 --- a/src/grp-boot/Makefile +++ b/src/grp-boot/Makefile @@ -23,6 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += bootctl systemd-boot +nested.subdirs += bootctl systemd-boot include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile index 84253d2387..a983e32a9f 100644 --- a/src/grp-boot/bootctl/Makefile +++ b/src/grp-boot/bootctl/Makefile @@ -51,4 +51,5 @@ dist_zshcompletion_data += \ shell-completion/zsh/_bootctl endif # HAVE_BLKID endif # ENABLE_EFI + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/Makefile b/src/grp-coredump/Makefile index 2e604d7b86..811efb5af5 100644 --- a/src/grp-coredump/Makefile +++ b/src/grp-coredump/Makefile @@ -23,6 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += coredumpctl systemd-coredump +nested.subdirs += coredumpctl systemd-coredump include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/systemd-coredump/systemd-coredump.tmpfiles b/src/grp-coredump/systemd-coredump/systemd-coredump.tmpfiles new file mode 100644 index 0000000000..02b052583d --- /dev/null +++ b/src/grp-coredump/systemd-coredump/systemd-coredump.tmpfiles @@ -0,0 +1,10 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# See tmpfiles.d(5) for details + +d /var/lib/systemd/coredump 0755 root root 3d diff --git a/src/grp-journal/grp-remote/Makefile b/src/grp-journal/grp-remote/Makefile index 4a18cd13bb..e4980fac9a 100644 --- a/src/grp-journal/grp-remote/Makefile +++ b/src/grp-journal/grp-remote/Makefile @@ -86,8 +86,8 @@ EXTRA_DIST += \ units/systemd-importd.service.in -at.subdirs += systemd-journa-gatewayd -at.subdirs += systemd-journa-remote -at.subdirs += systemd-journa-upload +nested.subdirs += systemd-journa-gatewayd +nested.subdirs += systemd-journa-remote +nested.subdirs += systemd-journa-upload include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-journal/systemd-journald/systemd-journald.tmpfiles.m4 b/src/grp-journal/systemd-journald/systemd-journald.tmpfiles.m4 index 2cd58e9121..1fe0f7acfc 100644 --- a/src/grp-journal/systemd-journald/systemd-journald.tmpfiles.m4 +++ b/src/grp-journal/systemd-journald/systemd-journald.tmpfiles.m4 @@ -7,23 +7,6 @@ # See tmpfiles.d(5) for details -d /run/user 0755 root root - -F! /run/utmp 0664 root utmp - - -d /run/systemd/ask-password 0755 root root - -d /run/systemd/seats 0755 root root - -d /run/systemd/sessions 0755 root root - -d /run/systemd/users 0755 root root - -d /run/systemd/machines 0755 root root - -d /run/systemd/shutdown 0755 root root - -m4_ifdef(`ENABLE_NETWORKD', -d /run/systemd/netif 0755 systemd-network systemd-network - -d /run/systemd/netif/links 0755 systemd-network systemd-network - -d /run/systemd/netif/leases 0755 systemd-network systemd-network - -)m4_dnl - -d /run/log 0755 root root - - z /run/log/journal 2755 root systemd-journal - - Z /run/log/journal/%m ~2750 root systemd-journal - - m4_ifdef(`HAVE_ACL',`m4_dnl @@ -68,6 +51,3 @@ a+ /var/log/journal/%m - - - - d:group:wheel:r-x a+ /var/log/journal/%m - - - - group:wheel:r-x a+ /var/log/journal/%m/system.journal - - - - group:wheel:r-- '')')')m4_dnl - -d /var/lib/systemd 0755 root root - -d /var/lib/systemd/coredump 0755 root root 3d diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile index 7412341233..a724b63ceb 100644 --- a/src/grp-machine/Makefile +++ b/src/grp-machine/Makefile @@ -23,7 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += machinectl systemd-machined -at.subdirs += nss-mymachines +nested.subdirs += machinectl systemd-machined +nested.subdirs += nss-mymachines include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-network/systemd-networkd/systemd-networkd.tmpfiles b/src/grp-network/systemd-networkd/systemd-networkd.tmpfiles new file mode 100644 index 0000000000..24197555ee --- /dev/null +++ b/src/grp-network/systemd-networkd/systemd-networkd.tmpfiles @@ -0,0 +1,12 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# See tmpfiles.d(5) for details + +d /run/systemd/netif 0755 systemd-network systemd-network - +d /run/systemd/netif/links 0755 systemd-network systemd-network - +d /run/systemd/netif/leases 0755 systemd-network systemd-network - diff --git a/src/grp-resolve/Makefile b/src/grp-resolve/Makefile index ae0c5a2466..4cea7de4c6 100644 --- a/src/grp-resolve/Makefile +++ b/src/grp-resolve/Makefile @@ -23,6 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += systemd-resolved nss-resolve +nested.subdirs += systemd-resolved nss-resolve include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile index ea8b031596..546ff4e88f 100644 --- a/src/grp-system/Makefile +++ b/src/grp-system/Makefile @@ -23,6 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += systemctl systemd +nested.subdirs += systemctl systemd include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/systemd/systemd.tmpfiles b/src/grp-system/systemd/systemd.tmpfiles new file mode 100644 index 0000000000..0a7c85d9ec --- /dev/null +++ b/src/grp-system/systemd/systemd.tmpfiles @@ -0,0 +1,22 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +# See tmpfiles.d(5) for details + +d /run/user 0755 root root - +F! /run/utmp 0664 root utmp - + +d /run/systemd/ask-password 0755 root root - +d /run/systemd/seats 0755 root root - +d /run/systemd/sessions 0755 root root - +d /run/systemd/users 0755 root root - +d /run/systemd/machines 0755 root root - +d /run/systemd/shutdown 0755 root root - + +d /run/log 0755 root root - + +d /var/lib/systemd 0755 root root - diff --git a/src/grp-timedate/Makefile b/src/grp-timedate/Makefile index bb8be753da..01c4f2f841 100644 --- a/src/grp-timedate/Makefile +++ b/src/grp-timedate/Makefile @@ -23,6 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += timedatectl systemd-timedated +nested.subdirs += timedatectl systemd-timedated include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile index 45d408fa19..47ce9cf936 100644 --- a/src/libbasic/Makefile +++ b/src/libbasic/Makefile @@ -23,5 +23,5 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += src include +nested.subdirs += src include include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libbasic/include/Makefile b/src/libbasic/include/Makefile index 0aa8325a7e..d3a3e62a0e 100644 --- a/src/libbasic/include/Makefile +++ b/src/libbasic/include/Makefile @@ -23,5 +23,5 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += basic +nested.subdirs += basic include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 7ed2706100..d6a307fc5a 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -23,5 +23,5 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += src +nested.subdirs += src include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd-network/Makefile b/src/libsystemd-network/Makefile index 96f14f58f2..afd9224056 100644 --- a/src/libsystemd-network/Makefile +++ b/src/libsystemd-network/Makefile @@ -23,5 +23,5 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += src test +nested.subdirs += src test include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libudev/Makefile b/src/libudev/Makefile index 8d9fecb1fb..369b265ff7 100644 --- a/src/libudev/Makefile +++ b/src/libudev/Makefile @@ -23,6 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += src +nested.subdirs += src include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/tmpfiles.d/.gitignore b/tmpfiles.d/.gitignore index 4f0ecaa9c3..c8c9fe059b 100644 --- a/tmpfiles.d/.gitignore +++ b/tmpfiles.d/.gitignore @@ -1,2 +1,2 @@ /etc.conf -/systemd.conf +/systemd-journald.conf diff --git a/tools/notsd-move b/tools/notsd-move index a65d29e946..5ae639fe26 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -475,7 +475,6 @@ move_files() ( mkdir src/grp-journal.d mv -t src/grp-journal.d tmpfiles.d/journal-nocow.* mv -t src/grp-remote.d tmpfiles.d/systemd-remote.* - mv -T tmpfiles.d/systemd{,-journald}.tmpfiles.m4 mv -t src/systemd tmpfiles.d/systemd-tmpfs.tmpfiles* mv -t src/systemd xorg/??-systemd-user.*; rmdir xorg mv -t src/systemd-vconsole-setup man/vconsole.conf.xml @@ -660,7 +659,6 @@ move_files() ( ) breakup_makefile() ( - set -x mkdir -p build-aux/Makefile.{once,each}.{head,tail} touch .tmp.move.all @@ -740,43 +738,50 @@ breakup_zshcompletion() ( rm _systemd ) +run() ( + local tmp + tmp="$(mktemp --tmpdir)" + trap 'rm -f -- "$tmp"' EXIT + "$0" "$@" |& tail -n20 > "$tmp" || { r=$?; cat "$tmp"; return $r; } + return 0 +) + move() ( find . \( -name Makefile -o -name '*.mk' \) -delete >&2 echo ' => breakup_zshcompletion' - breakup_zshcompletion + run breakup_zshcompletion >&2 echo ' => move_files' - move_files + run move_files >&2 echo ' => breakup_makefile' - "$0" breakup_makefile |& tail -n20 > .tmp.log || { r=$?; cat .tmp.log; exit $r; } - rm .tmp.log + run breakup_makefile >&2 echo ' => ./tools/notsd-fixup' ./tools/notsd-fixup ) main() { - set -e - set -o pipefail - - if [[ $# -gt 0 ]]; then - "$@" - else - if [[ -n "$(git status -s)" ]] || [[ -n "$(git clean -xdn)" ]]; then - echo 'There are changes in the current directory.' >&2 - exit 1 - fi + if [[ -n "$(git status -s)" ]] || [[ -n "$(git clean -xdn)" ]]; then + echo 'There are changes in the current directory.' >&2 + exit 1 + fi - git checkout -b tmp/postmove + git checkout -b tmp/postmove - move + move - git add . - git commit -m './tools/notsd-move' - git merge -s ours notsystemd/postmove - git checkout notsystemd/postmove - git merge tmp/postmove - git branch -d tmp/postmove - fi + git add . + git commit -m './tools/notsd-move' + git merge -s ours notsystemd/postmove + git checkout notsystemd/postmove + git merge tmp/postmove + git branch -d tmp/postmove } -main "$@" +set -e +set -o pipefail +if [[ $# -gt 0 ]]; then + set -x; +else + set -- main +fi +"$@" |