chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
analyze: various cleanups
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index e23a6b44829ec04a2ac8f8b3ea3b2f131baae6ef..05bf582e267b2286ff644243a7a62b304f659e23 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-32,16
+32,16
@@
SUBDIRS = . po
.SECONDARY:
LIBUDEV_CURRENT=3
.SECONDARY:
LIBUDEV_CURRENT=3
-LIBUDEV_REVISION=
1
+LIBUDEV_REVISION=
2
LIBUDEV_AGE=2
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBUDEV_AGE=2
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
-LIBSYSTEMD_LOGIN_CURRENT=
3
-LIBSYSTEMD_LOGIN_REVISION=
11
-LIBSYSTEMD_LOGIN_AGE=
3
+LIBSYSTEMD_LOGIN_CURRENT=
4
+LIBSYSTEMD_LOGIN_REVISION=
0
+LIBSYSTEMD_LOGIN_AGE=
4
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=7
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=7
@@
-51,9
+51,9
@@
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_ID128_REVISION=17
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_ID128_REVISION=17
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=
7
-LIBSYSTEMD_JOURNAL_REVISION=
1
-LIBSYSTEMD_JOURNAL_AGE=
7
+LIBSYSTEMD_JOURNAL_CURRENT=
8
+LIBSYSTEMD_JOURNAL_REVISION=
0
+LIBSYSTEMD_JOURNAL_AGE=
8
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-318,7
+318,6
@@
systemd_analyze_LDADD = \
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
- shell-completion/bash/systemd-coredumpctl \
shell-completion/bash/udevadm
dist_tmpfiles_DATA = \
shell-completion/bash/udevadm
dist_tmpfiles_DATA = \
@@
-343,8
+342,6
@@
dist_systemunit_DATA = \
units/kexec.target \
units/local-fs.target \
units/local-fs-pre.target \
units/kexec.target \
units/local-fs.target \
units/local-fs-pre.target \
- units/initrd-fs.target \
- units/initrd-fs-pre.target \
units/remote-fs.target \
units/remote-fs-pre.target \
units/network.target \
units/remote-fs.target \
units/remote-fs-pre.target \
units/network.target \
@@
-525,7
+522,7
@@
CLEANFILES += \
man/index.html
man/index.html:
man/index.html
man/index.html:
- $(AM_V_GEN)$(LN_S) systemd.index.html $@
+ $(AM_V_GEN)$(LN_S)
-f
systemd.index.html $@
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
@@
-845,6
+842,8
@@
libsystemd_core_la_SOURCES = \
src/core/selinux-access.h \
src/core/selinux-setup.c \
src/core/selinux-setup.h \
src/core/selinux-access.h \
src/core/selinux-setup.c \
src/core/selinux-setup.h \
+ src/core/smack-setup.c \
+ src/core/smack-setup.h \
src/core/ima-setup.c \
src/core/ima-setup.h \
src/core/locale-setup.h \
src/core/ima-setup.c \
src/core/ima-setup.h \
src/core/locale-setup.h \
@@
-2376,13
+2375,6
@@
journalctl_LDADD += \
$(QRENCODE_LIBS)
endif
$(QRENCODE_LIBS)
endif
-systemd_coredumpctl_SOURCES = \
- src/journal/coredumpctl.c
-
-systemd_coredumpctl_LDADD = \
- libsystemd-shared.la \
- libsystemd-journal.la
-
test_journal_SOURCES = \
src/journal/test-journal.c
test_journal_SOURCES = \
src/journal/test-journal.c
@@
-2571,9
+2563,16
@@
libsystemd_journal_internal_la_LIBADD += \
$(GCRYPT_LIBS)
endif
$(GCRYPT_LIBS)
endif
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if
+# needed. Also, grant read access to new journal files to members of
+# "adm" and "wheel".
libsystemd-journal-install-hook:
libname=libsystemd-journal.so && $(move-to-rootlibdir)
libsystemd-journal-install-hook:
libname=libsystemd-journal.so && $(move-to-rootlibdir)
+ $(MKDIR_P) $(DESTDIR)/var/log/journal
+ -chown 0:0 $(DESTDIR)/var/log/journal
+ -chmod 755 $(DESTDIR)/var/log/journal
+ -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
+ -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
libsystemd-journal-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
libsystemd-journal-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
@@
-2627,7
+2626,6
@@
rootbin_PROGRAMS += \
journalctl
bin_PROGRAMS += \
journalctl
bin_PROGRAMS += \
- systemd-coredumpctl \
systemd-cat
dist_systemunit_DATA += \
systemd-cat
dist_systemunit_DATA += \
@@
-2719,6
+2717,19
@@
endif
rootlibexec_PROGRAMS += \
systemd-coredump
rootlibexec_PROGRAMS += \
systemd-coredump
+systemd_coredumpctl_SOURCES = \
+ src/journal/coredumpctl.c
+
+systemd_coredumpctl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal.la
+
+bin_PROGRAMS += \
+ systemd-coredumpctl
+
+dist_bashcompletion_DATA += \
+ shell-completion/bash/systemd-coredumpctl
+
sysctl_DATA = \
sysctl.d/coredump.conf
sysctl_DATA = \
sysctl.d/coredump.conf
@@
-3502,11
+3513,11
@@
PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
SPHINXOPTS = -D latex_paper_size=$(PAPER)
sphinx-%:
$(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
SPHINXOPTS = -D latex_paper_size=$(PAPER)
sphinx-%:
$(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
- $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/
man
/python-systemd/
- $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/
man
/python-systemd/
+ $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/
docs
/python-systemd/
+ $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/
docs
/python-systemd/
destdir-sphinx: all
destdir-sphinx: all
- dir="$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
+ dir="$
$
(mktemp -d /tmp/systemd-install.XXXXXX)" && \
$(MAKE) DESTDIR="$$dir" install && \
$(MAKE) DESTDIR="$$dir" sphinx-html && \
rm -rf "$$dir"
$(MAKE) DESTDIR="$$dir" install && \
$(MAKE) DESTDIR="$$dir" sphinx-html && \
rm -rf "$$dir"
@@
-3839,7
+3850,7
@@
doc-sync: all destdir-sphinx
gtkdoc-rebase --html-dir=docs/gudev/html --online
rsync -av --delete docs/gudev/html/ --omit-dir-times $(www_target)/gudev/
rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
gtkdoc-rebase --html-dir=docs/gudev/html --online
rsync -av --delete docs/gudev/html/ --omit-dir-times $(www_target)/gudev/
rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
- rsync -av --delete --omit-dir-times
man/python-systemd/ $(www_target)/man
/python-systemd/
+ rsync -av --delete --omit-dir-times
docs/python-systemd/ $(www_target)
/python-systemd/
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"