chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: add new system-cat tool as kind of a more powerfull BSD logger
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index b778b1a2c66f9ce7bd2825068f124c2ca549e9d8..d94de56ff1d27d664e31f9f003c97c87940af59d 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-56,12
+56,12
@@
usergeneratordir=$(pkglibexecdir)/user-generators
pkgincludedir=$(includedir)/systemd
# And these are the special ones for /
pkgincludedir=$(includedir)/systemd
# And these are the special ones for /
-root
dir=@rootdir
@
-rootbindir=$(root
dir
)/bin
-rootlibexecdir=$(root
dir
)/lib/systemd
+root
prefix=@rootprefix
@
+rootbindir=$(root
prefix
)/bin
+rootlibexecdir=$(root
prefix
)/lib/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
systemshutdowndir=$(rootlibexecdir)/system-shutdown
systemgeneratordir=$(rootlibexecdir)/system-generators
systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemunitdir=$(root
dir
)/lib/systemd/system
+systemunitdir=$(root
prefix
)/lib/systemd/system
CLEANFILES =
EXTRA_DIST =
CLEANFILES =
EXTRA_DIST =
@@
-89,6
+89,7
@@
AM_CPPFLAGS = \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
+ -DROOTPREFIX=\"$(rootprefix)\" \
-DRUNTIME_DIR=\"/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-DRUNTIME_DIR=\"/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
@@
-99,7
+100,8
@@
AM_CPPFLAGS = \
-I $(top_srcdir)/src \
-I $(top_srcdir)/src/readahead \
-I $(top_srcdir)/src/login \
-I $(top_srcdir)/src \
-I $(top_srcdir)/src/readahead \
-I $(top_srcdir)/src/login \
- -I $(top_srcdir)/src/journal
+ -I $(top_srcdir)/src/journal \
+ -I $(top_srcdir)/src/systemd
if TARGET_GENTOO
AM_CPPFLAGS += \
if TARGET_GENTOO
AM_CPPFLAGS += \
@@
-179,7
+181,6
@@
bin_PROGRAMS += \
endif
rootlibexec_PROGRAMS = \
endif
rootlibexec_PROGRAMS = \
- systemd-stdout-syslog-bridge \
systemd-cgroups-agent \
systemd-initctl \
systemd-update-utmp \
systemd-cgroups-agent \
systemd-initctl \
systemd-update-utmp \
@@
-187,7
+188,6
@@
rootlibexec_PROGRAMS = \
systemd-shutdown \
systemd-modules-load \
systemd-remount-api-vfs \
systemd-shutdown \
systemd-modules-load \
systemd-remount-api-vfs \
- systemd-kmsg-syslogd \
systemd-reply-password \
systemd-fsck \
systemd-timestamp \
systemd-reply-password \
systemd-fsck \
systemd-timestamp \
@@
-285,7
+285,6
@@
dist_systemunit_DATA = \
units/sockets.target \
units/swap.target \
units/systemd-initctl.socket \
units/sockets.target \
units/swap.target \
units/systemd-initctl.socket \
- units/systemd-stdout-syslog-bridge.socket \
units/systemd-shutdownd.socket \
units/syslog.socket \
units/dev-hugepages.mount \
units/systemd-shutdownd.socket \
units/syslog.socket \
units/dev-hugepages.mount \
@@
-317,9
+316,7
@@
nodist_systemunit_DATA = \
units/serial-getty@.service \
units/console-shell.service \
units/systemd-initctl.service \
units/serial-getty@.service \
units/console-shell.service \
units/systemd-initctl.service \
- units/systemd-stdout-syslog-bridge.service \
units/systemd-shutdownd.service \
units/systemd-shutdownd.service \
- units/systemd-kmsg-syslogd.service \
units/systemd-modules-load.service \
units/systemd-remount-api-vfs.service \
units/systemd-update-utmp-runlevel.service \
units/systemd-modules-load.service \
units/systemd-remount-api-vfs.service \
units/systemd-update-utmp-runlevel.service \
@@
-351,9
+348,7
@@
EXTRA_DIST += \
units/console-shell.service.m4 \
units/rescue.service.m4 \
units/systemd-initctl.service.in \
units/console-shell.service.m4 \
units/rescue.service.m4 \
units/systemd-initctl.service.in \
- units/systemd-stdout-syslog-bridge.service.in \
units/systemd-shutdownd.service.in \
units/systemd-shutdownd.service.in \
- units/systemd-kmsg-syslogd.service.in \
units/systemd-modules-load.service.in \
units/systemd-remount-api-vfs.service.in \
units/systemd-update-utmp-runlevel.service.in \
units/systemd-modules-load.service.in \
units/systemd-remount-api-vfs.service.in \
units/systemd-update-utmp-runlevel.service.in \
@@
-371,7
+366,7
@@
EXTRA_DIST += \
units/fsck@.service.in \
units/fsck-root.service.in \
units/user@.service.in \
units/fsck@.service.in \
units/fsck-root.service.in \
units/user@.service.in \
- systemd.pc.in \
+ s
rc/s
ystemd.pc.in \
introspect.awk \
src/73-seat-late.rules.in \
src/99-systemd.rules.in \
introspect.awk \
src/73-seat-late.rules.in \
src/99-systemd.rules.in \
@@
-442,7
+437,7
@@
dist_doc_DATA = \
DISTRO_PORTING
pkgconfigdata_DATA = \
DISTRO_PORTING
pkgconfigdata_DATA = \
- systemd.pc
+ s
rc/s
ystemd.pc
# First passed through sed, followed by intltool
polkitpolicy_in_in_files = \
# First passed through sed, followed by intltool
polkitpolicy_in_in_files = \
@@
-567,8
+562,68
@@
libsystemd_core_la_LIBADD = \
# list the .h files as dependencies if we want make dist to work.
EXTRA_DIST += \
# list the .h files as dependencies if we want make dist to work.
EXTRA_DIST += \
- ${libsystemd_basic_la_SOURCES:.c=.h} \
- ${libsystemd_core_la_SOURCES:.c=.h} \
+ src/util.h \
+ src/virt.h \
+ src/label.h \
+ src/hashmap.h \
+ src/set.h \
+ src/strv.h \
+ src/conf-parser.h \
+ src/socket-util.h \
+ src/log.h \
+ src/ratelimit.h \
+ src/exit-status.h \
+ src/unit.h \
+ src/job.h \
+ src/manager.h \
+ src/path-lookup.h \
+ src/load-fragment.h \
+ src/service.h \
+ src/automount.h \
+ src/mount.h \
+ src/swap.h \
+ src/device.h \
+ src/target.h \
+ src/snapshot.h \
+ src/socket.h \
+ src/timer.h \
+ src/path.h \
+ src/load-dropin.h \
+ src/execute.h \
+ src/utmp-wtmp.h \
+ src/dbus.h \
+ src/dbus-manager.h \
+ src/dbus-unit.h \
+ src/dbus-job.h \
+ src/dbus-service.h \
+ src/dbus-socket.h \
+ src/dbus-timer.h \
+ src/dbus-target.h \
+ src/dbus-mount.h \
+ src/dbus-automount.h \
+ src/dbus-swap.h \
+ src/dbus-snapshot.h \
+ src/dbus-device.h \
+ src/dbus-execute.h \
+ src/dbus-path.h \
+ src/cgroup.h \
+ src/mount-setup.h \
+ src/hostname-setup.h \
+ src/selinux-setup.h \
+ src/loopback-setup.h \
+ src/kmod-setup.h \
+ src/locale-setup.h \
+ src/machine-id-setup.h \
+ src/specifier.h \
+ src/unit-name.h \
+ src/fdset.h \
+ src/namespace.h \
+ src/tcpwrap.h \
+ src/cgroup-util.h \
+ src/condition.h \
+ src/dbus-common.h \
+ src/install.h \
+ src/cgroup-attr.h \
src/macro.h \
src/def.h \
src/ioprio.h \
src/macro.h \
src/def.h \
src/ioprio.h \
@@
-591,7
+646,8
@@
EXTRA_DIST += \
src/polkit.h \
src/dbus-loop.h \
src/spawn-agent.h \
src/polkit.h \
src/dbus-loop.h \
src/spawn-agent.h \
- src/acl-util.h
+ src/acl-util.h \
+ src/logs-show.h
MANPAGES = \
man/systemd.1 \
MANPAGES = \
man/systemd.1 \
@@
-748,15
+804,6
@@
test_install_CFLAGS = \
test_install_LDADD = \
libsystemd-basic.la
test_install_LDADD = \
libsystemd-basic.la
-systemd_stdout_syslog_bridge_SOURCES = \
- src/stdout-syslog-bridge.c \
- src/tcpwrap.c
-
-systemd_stdout_syslog_bridge_LDADD = \
- libsystemd-basic.la \
- libsystemd-daemon.la \
- $(LIBWRAP_LIBS)
-
systemd_initctl_SOURCES = \
src/initctl.c \
src/dbus-common.c
systemd_initctl_SOURCES = \
src/initctl.c \
src/dbus-common.c
@@
-905,14
+952,6
@@
systemd_cgroups_agent_LDADD = \
libsystemd-basic.la \
$(DBUS_LIBS)
libsystemd-basic.la \
$(DBUS_LIBS)
-systemd_kmsg_syslogd_SOURCES = \
- src/kmsg-syslogd.c \
- src/fdset.c
-
-systemd_kmsg_syslogd_LDADD = \
- libsystemd-basic.la \
- libsystemd-daemon.la
-
systemctl_SOURCES = \
src/systemctl.c \
src/utmp-wtmp.c \
systemctl_SOURCES = \
src/systemctl.c \
src/utmp-wtmp.c \
@@
-925,7
+964,7
@@
systemctl_SOURCES = \
src/pager.c \
src/install.c \
src/spawn-agent.c \
src/pager.c \
src/install.c \
src/spawn-agent.c \
-
src/logs-show.c
+ src/logs-show.c
systemctl_CFLAGS = \
$(AM_CFLAGS) \
systemctl_CFLAGS = \
$(AM_CFLAGS) \
@@
-935,6
+974,7
@@
systemctl_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
libsystemd-journal.la \
libsystemd-basic.la \
libsystemd-daemon.la \
libsystemd-journal.la \
+ libsystemd-id128.la \
$(DBUS_LIBS)
systemd_notify_SOURCES = \
$(DBUS_LIBS)
systemd_notify_SOURCES = \
@@
-1051,7
+1091,7
@@
libsystemd_daemon_la_LDFLAGS = \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
pkginclude_HEADERS += \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
pkginclude_HEADERS += \
- src/sd-daemon.h
+ src/s
ystemd/s
d-daemon.h
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-daemon-install-hook:
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-daemon-install-hook:
@@
-1076,7
+1116,7
@@
lib_LTLIBRARIES += \
libsystemd-daemon.la
pkgconfiglib_DATA += \
libsystemd-daemon.la
pkgconfiglib_DATA += \
- libsystemd-daemon.pc
+
src/
libsystemd-daemon.pc
MANPAGES += \
man/sd-daemon.7 \
MANPAGES += \
man/sd-daemon.7 \
@@
-1099,7
+1139,7
@@
man/sd_is_mq.3: man/sd_is_fifo.3
man/sd_notifyf.3: man/sd_notify.3
EXTRA_DIST += \
man/sd_notifyf.3: man/sd_notify.3
EXTRA_DIST += \
- libsystemd-daemon.pc.in \
+
src/
libsystemd-daemon.pc.in \
src/libsystemd-daemon.sym
# ------------------------------------------------------------------------------
src/libsystemd-daemon.sym
# ------------------------------------------------------------------------------
@@
-1129,13
+1169,13
@@
noinst_PROGRAMS += \
test-id128
pkginclude_HEADERS += \
test-id128
pkginclude_HEADERS += \
- src/sd-id128.h
+ src/s
ystemd/s
d-id128.h
lib_LTLIBRARIES += \
libsystemd-id128.la
pkgconfiglib_DATA += \
lib_LTLIBRARIES += \
libsystemd-id128.la
pkgconfiglib_DATA += \
- libsystemd-id128.pc
+
src/
libsystemd-id128.pc
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-id128-install-hook:
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-id128-install-hook:
@@
-1157,7
+1197,7
@@
UNINSTALL_EXEC_HOOKS += \
libsystemd-id128-uninstall-hook
EXTRA_DIST += \
libsystemd-id128-uninstall-hook
EXTRA_DIST += \
- libsystemd-id128.pc.in \
+
src/
libsystemd-id128.pc.in \
src/libsystemd-id128.sym
# ------------------------------------------------------------------------------
src/libsystemd-id128.sym
# ------------------------------------------------------------------------------
@@
-1168,9
+1208,16
@@
systemd_journald_SOURCES = \
src/journal/lookup3.c \
src/journal/journal-rate-limit.c \
src/sd-id128.c \
src/journal/lookup3.c \
src/journal/journal-rate-limit.c \
src/sd-id128.c \
- src/acl-util.c \
src/cgroup-util.c
src/cgroup-util.c
+if HAVE_ACL
+systemd_journald_SOURCES += \
+ src/acl-util.c
+endif
+
+nodist_systemd_journald_SOURCES = \
+ src/journal/journald-gperf.c
+
systemd_journald_CFLAGS = \
$(AM_CFLAGS) \
$(ACL_CFLAGS)
systemd_journald_CFLAGS = \
$(AM_CFLAGS) \
$(ACL_CFLAGS)
@@
-1190,19
+1237,28
@@
systemd_journald_LDADD += \
$(XZ_LIBS)
endif
$(XZ_LIBS)
endif
+systemd_cat_SOURCES = \
+ src/journal/cat.c
+
+systemd_cat_LDADD = \
+ libsystemd-basic.la \
+ libsystemd-journal.la
+
systemd_journalctl_SOURCES = \
src/journal/journalctl.c \
src/pager.c \
systemd_journalctl_SOURCES = \
src/journal/journalctl.c \
src/pager.c \
-
src/logs-show.c
+ src/logs-show.c
systemd_journalctl_LDADD = \
libsystemd-basic.la \
systemd_journalctl_LDADD = \
libsystemd-basic.la \
- libsystemd-journal.la
+ libsystemd-journal.la \
+ libsystemd-id128.la
if HAVE_XZ
systemd_journalctl_SOURCES += \
src/journal/compress.c
systemd_journalctl_CFLAGS = \
if HAVE_XZ
systemd_journalctl_SOURCES += \
src/journal/compress.c
systemd_journalctl_CFLAGS = \
+ $(AM_CFLAGS) \
$(XZ_CFLAGS)
systemd_journalctl_LDADD += \
$(XZ_LIBS)
$(XZ_CFLAGS)
systemd_journalctl_LDADD += \
$(XZ_LIBS)
@@
-1224,6
+1280,7
@@
test_journal_SOURCES += \
src/journal/compress.c
test_journal_CFLAGS = \
src/journal/compress.c
test_journal_CFLAGS = \
+ $(AM_CFLAGS) \
$(XZ_CFLAGS)
test_journal_LDADD += \
$(XZ_CFLAGS)
test_journal_LDADD += \
@@
-1233,13
+1290,11
@@
endif
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/journal/journal-file.c \
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/journal/journal-file.c \
- src/journal/compress.c \
src/journal/lookup3.c \
src/journal/journal-send.c
libsystemd_journal_la_CFLAGS = \
$(AM_CFLAGS) \
src/journal/lookup3.c \
src/journal/journal-send.c
libsystemd_journal_la_CFLAGS = \
$(AM_CFLAGS) \
- $(XZ_CFLAGS) \
-fvisibility=hidden
libsystemd_journal_la_LDFLAGS = \
-fvisibility=hidden
libsystemd_journal_la_LDFLAGS = \
@@
-1249,8
+1304,18
@@
libsystemd_journal_la_LDFLAGS = \
libsystemd_journal_la_LIBADD = \
libsystemd-basic.la \
libsystemd_journal_la_LIBADD = \
libsystemd-basic.la \
- libsystemd-id128.la \
+ libsystemd-id128.la
+
+if HAVE_XZ
+libsystemd_journal_la_SOURCES += \
+ src/journal/compress.c
+
+libsystemd_journal_la_CFLAGS += \
+ $(XZ_CFLAGS)
+
+libsystemd_journal_la_LIBADD += \
$(XZ_LIBS)
$(XZ_LIBS)
+endif
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-journal-install-hook:
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-journal-install-hook:
@@
-1275,7
+1340,8
@@
noinst_PROGRAMS += \
test-journal
pkginclude_HEADERS += \
test-journal
pkginclude_HEADERS += \
- src/journal/sd-journal.h
+ src/systemd/sd-journal.h \
+ src/systemd/sd-messages.h
lib_LTLIBRARIES += \
libsystemd-journal.la
lib_LTLIBRARIES += \
libsystemd-journal.la
@@
-1286,24
+1352,37
@@
rootlibexec_PROGRAMS += \
rootbin_PROGRAMS += \
systemd-journalctl
rootbin_PROGRAMS += \
systemd-journalctl
+bin_PROGRAMS += \
+ systemd-cat
+
dist_systemunit_DATA += \
units/systemd-journald.socket
nodist_systemunit_DATA += \
units/systemd-journald.service
dist_systemunit_DATA += \
units/systemd-journald.socket
nodist_systemunit_DATA += \
units/systemd-journald.service
+dist_pkgsysconf_DATA += \
+ src/journal/systemd-journald.conf
+
pkgconfiglib_DATA += \
src/journal/libsystemd-journal.pc
journal-install-data-hook:
pkgconfiglib_DATA += \
src/journal/libsystemd-journal.pc
journal-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/sockets.target.wants \
+ $(DESTDIR)$(systemunitdir)/sysinit.target.wants
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
rm -f systemd-journald.socket && \
$(LN_S) ../systemd-journald.socket )
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
rm -f systemd-journald.socket && \
$(LN_S) ../systemd-journald.socket )
+ ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+ rm -f systemd-journald.service && \
+ $(LN_S) ../systemd-journald.service )
INSTALL_DATA_HOOKS += \
journal-install-data-hook
EXTRA_DIST += \
INSTALL_DATA_HOOKS += \
journal-install-data-hook
EXTRA_DIST += \
+ src/journal/journald.h \
src/journal/journal-def.h \
src/journal/journal-internal.h \
src/journal/journal-file.h \
src/journal/journal-def.h \
src/journal/journal-internal.h \
src/journal/journal-file.h \
@@
-1312,7
+1391,11
@@
EXTRA_DIST += \
src/journal/journal-rate-limit.h \
src/journal/libsystemd-journal.pc.in \
src/journal/libsystemd-journal.sym \
src/journal/journal-rate-limit.h \
src/journal/libsystemd-journal.pc.in \
src/journal/libsystemd-journal.sym \
- units/systemd-journald.service.in
+ units/systemd-journald.service.in \
+ src/journal/journald-gperf.gperf
+
+CLEANFILES += \
+ src/journal/journald-gperf.c
# ------------------------------------------------------------------------------
if ENABLE_BINFMT
# ------------------------------------------------------------------------------
if ENABLE_BINFMT
@@
-1335,7
+1418,8
@@
nodist_systemunit_DATA += \
binfmt-install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(prefix)/lib/binfmt.d \
binfmt-install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(prefix)/lib/binfmt.d \
- $(DESTDIR)$(sysconfdir)/binfmt.d
+ $(DESTDIR)$(sysconfdir)/binfmt.d \
+ $(DESTDIR)$(systemunitdir)/sysinit.target.wants
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f systemd-binfmt.service \
proc-sys-fs-binfmt_misc.automount && \
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f systemd-binfmt.service \
proc-sys-fs-binfmt_misc.automount && \
@@
-1367,6
+1451,8
@@
nodist_systemunit_DATA += \
units/systemd-vconsole-setup.service
vconsole-install-data-hook:
units/systemd-vconsole-setup.service
vconsole-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/sysinit.target.wants
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f systemd-vconsole-setup.service && \
$(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service )
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f systemd-vconsole-setup.service && \
$(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service )
@@
-1422,7
+1508,7
@@
nodist_systemunit_DATA += \
units/systemd-readahead-done.service
EXTRA_DIST += \
units/systemd-readahead-done.service
EXTRA_DIST += \
- src/
readahea
d/sd-readahead.h \
+ src/
system
d/sd-readahead.h \
src/readahead/readahead-common.h \
units/systemd-readahead-collect.service.in \
units/systemd-readahead-replay.service.in \
src/readahead/readahead-common.h \
units/systemd-readahead-collect.service.in \
units/systemd-readahead-replay.service.in \
@@
-1471,6
+1557,9
@@
systemd_random_seed_LDADD = \
libsystemd-basic.la
randomseed-install-data-hook:
libsystemd-basic.la
randomseed-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+ $(DESTDIR)$(systemunitdir)/sysinit.target.wants
( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
rm -f systemd-random-seed-save.service && \
$(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
rm -f systemd-random-seed-save.service && \
$(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
@@
-1515,6
+1604,8
@@
systemd_cryptsetup_generator_LDADD = \
libsystemd-basic.la
cryptsetup-install-data-hook:
libsystemd-basic.la
cryptsetup-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/sysinit.target.wants
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f cryptsetup.target && \
$(LN_S) ../cryptsetup.target cryptsetup.target )
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f cryptsetup.target && \
$(LN_S) ../cryptsetup.target cryptsetup.target )
@@
-1844,7
+1935,7
@@
dist_pkgsysconf_DATA += \
src/login/systemd-logind.conf
pkginclude_HEADERS += \
src/login/systemd-logind.conf
pkginclude_HEADERS += \
- src/
login
/sd-login.h
+ src/
systemd
/sd-login.h
lib_LTLIBRARIES += \
libsystemd-login.la
lib_LTLIBRARIES += \
libsystemd-login.la
@@
-1856,6
+1947,8
@@
polkitpolicy_in_files += \
src/login/org.freedesktop.login1.policy.in
logind-install-data-hook:
src/login/org.freedesktop.login1.policy.in
logind-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/multi-user.target.wants
( cd $(DESTDIR)$(systemunitdir) && \
rm -f dbus-org.freedesktop.login1.service && \
$(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
( cd $(DESTDIR)$(systemunitdir) && \
rm -f dbus-org.freedesktop.login1.service && \
$(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
@@
-2149,11
+2242,9
@@
systemd-install-data-hook:
rm -f user && \
$(LN_S) $(pkgsysconfdir)/user user )
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
rm -f user && \
$(LN_S) $(pkgsysconfdir)/user user )
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
- rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket && \
- $(LN_S) ../systemd-stdout-syslog-bridge.socket systemd-stdout-syslog-bridge.socket && \
+ rm -f systemd-initctl.socket systemd-shutdownd.socket && \
$(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
$(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
- $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
- $(LN_S) ../syslog.socket syslog.socket )
+ $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
rm -f systemd-update-utmp-runlevel.service && \
$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
rm -f systemd-update-utmp-runlevel.service && \
$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
@@
-2224,8
+2315,7
@@
systemd-install-data-hook:
systemd-modules-load.service \
systemd-tmpfiles-setup.service \
systemd-sysctl.service \
systemd-modules-load.service \
systemd-tmpfiles-setup.service \
systemd-sysctl.service \
- systemd-ask-password-console.path \
- systemd-kmsg-syslogd.service && \
+ systemd-ask-password-console.path && \
$(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \
$(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
$(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
$(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \
$(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
$(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
@@
-2235,8
+2325,7
@@
systemd-install-data-hook:
$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
$(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
$(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
- $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
- $(LN_S) ../systemd-kmsg-syslogd.service )
+ $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
rm -f systemd-tmpfiles-clean.timer && \
$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
rm -f systemd-tmpfiles-clean.timer && \
$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
@@
-2364,11
+2453,11
@@
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
- --with-root
dir=$$dc_install_base/$(rootdir
)
+ --with-root
prefix=$$dc_install_base/$(rootprefix
)
upload: all distcheck
upload: all distcheck
- cp -v systemd-$(VERSION).tar.
bz2
/home/lennart/git.fedora/systemd/
- scp systemd-$(VERSION).tar.
bz2
fdo:/srv/www.freedesktop.org/www/software/systemd/
+ cp -v systemd-$(VERSION).tar.
xz
/home/lennart/git.fedora/systemd/
+ scp systemd-$(VERSION).tar.
xz
fdo:/srv/www.freedesktop.org/www/software/systemd/
scp man/*.html tango:public/systemd-man/
git-tag:
scp man/*.html tango:public/systemd-man/
git-tag: