udevrulesdir=@udevrulesdir@
pamlibdir=@pamlibdir@
pkgconfigdatadir=$(datadir)/pkgconfig
+polkitpolicydir=$(datadir)/polkit-1/actions
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
sessionunitdir=$(pkgdatadir)/session
+tmpfilesdir=$(sysconfdir)/tmpfiles.d
# And these are the special ones for /
rootdir=@rootdir@
rootbindir=$(rootdir)/bin
+rootsbindir=$(rootdir)/sbin
rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system
AM_CPPFLAGS = \
- -include $(top_builddir)/config.h \
+ -include $(top_builddir)/config.h \
-DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+ -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DRUNTIME_DIR=\"$(localstatedir)/run\" \
+ -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
+ -DKEXEC_BINARY_PATH=\"$(rootsbindir)/kexec\" \
-I $(top_srcdir)/src
+if TARGET_GENTOO
+AM_CPPFLAGS += \
+ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+ -DKBD_SETFONT=\"/usr/bin/setfont\" \
+ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+if TARGET_ARCH
+AM_CPPFLAGS += \
+ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+ -DKBD_SETFONT=\"/usr/bin/setfont\" \
+ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+AM_CPPFLAGS += \
+ -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+ -DKBD_SETFONT=\"/bin/setfont\" \
+ -DDEFAULT_FONT=\"latarcyrheb-sun16\"
+endif
+endif
+
rootbin_PROGRAMS = \
systemd \
systemctl \
- systemd-notify
+ systemd-notify \
+ systemd-ask-password
bin_PROGRAMS = \
- systemd-install
+ systemd-cgls
if HAVE_GTK
bin_PROGRAMS += \
- systemadm
+ systemadm \
+ systemd-ask-password-agent
endif
rootlibexec_PROGRAMS = \
systemd-logger \
systemd-cgroups-agent \
- systemd-initctl
+ systemd-initctl \
+ systemd-update-utmp \
+ systemd-random-seed \
+ systemd-shutdownd \
+ systemd-shutdown \
+ systemd-modules-load \
+ systemd-remount-api-vfs \
+ systemd-kmsg-syslogd \
+ systemd-vconsole-setup \
+ systemd-reply-password \
+ systemd-readahead-collect \
+ systemd-readahead-replay \
+ systemd-tmpfiles \
+ systemd-user-sessions
noinst_PROGRAMS = \
test-engine \
test-job-type \
test-ns \
test-loopback \
+ test-hostname \
test-daemon \
- test-cgroup
+ test-cgroup \
+ test-env-replace
if HAVE_PAM
pamlib_LTLIBRARIES = \
org.freedesktop.systemd1.Swap.xml \
org.freedesktop.systemd1.Path.xml
+dist_tmpfiles_DATA = \
+ tmpfiles.d/systemd.conf \
+ tmpfiles.d/x11.conf
+
dist_systemunit_DATA = \
units/emergency.service \
+ units/emergency.target \
units/basic.target \
units/getty.target \
units/halt.target \
units/network.target \
units/nss-lookup.target \
units/mail-transfer-agent.target \
+ units/http-daemon.target \
units/poweroff.target \
units/reboot.target \
units/rescue.target \
units/rpcbind.target \
units/rtc-set.target \
units/shutdown.target \
+ units/umount.target \
units/sigpwr.target \
units/sockets.target \
units/swap.target \
+ units/dbus.target \
units/systemd-initctl.socket \
units/systemd-logger.socket \
+ units/systemd-shutdownd.socket \
+ units/systemd-kmsg-syslogd.socket \
units/dev-hugepages.automount \
units/dev-hugepages.mount \
units/dev-mqueue.automount \
units/sys-kernel-debug.mount \
units/sys-kernel-security.automount \
units/sys-kernel-security.mount \
+ units/tmp.mount \
units/var-lock.mount \
- units/var-run.mount
+ units/var-run.mount \
+ units/hwclock-load.service \
+ units/hwclock-save.service \
+ units/sysctl.service \
+ units/remount-rootfs.service \
+ units/printer.target \
+ units/bluetooth.target \
+ units/smartcard.target \
+ units/tmpwatch.service \
+ units/tmpwatch.timer \
+ units/systemd-readahead-done.timer
nodist_systemunit_DATA = \
units/sysinit.target \
units/getty@.service \
+ units/serial-getty@.service \
units/graphical.target \
units/remote-fs.target \
units/multi-user.target \
units/systemd-initctl.service \
units/systemd-logger.service \
- units/syslog.target \
- units/dbus.target
+ units/systemd-shutdownd.service \
+ units/systemd-kmsg-syslogd.service \
+ units/systemd-modules-load.service \
+ units/systemd-vconsole-setup.service \
+ units/systemd-remount-api-vfs.service \
+ units/systemd-update-utmp-runlevel.service \
+ units/systemd-update-utmp-shutdown.service \
+ units/systemd-random-seed-save.service \
+ units/systemd-random-seed-load.service \
+ units/systemd-readahead-collect.service \
+ units/systemd-readahead-replay.service \
+ units/systemd-readahead-done.service \
+ units/systemd-tmpfiles.service \
+ units/systemd-user-sessions.service \
+ units/syslog.target
dist_sessionunit_DATA = \
units/session/default.target
EXTRA_DIST = \
units/sysinit.target.m4 \
units/getty@.service.m4 \
+ units/serial-getty@.service.m4 \
units/graphical.target.m4 \
units/multi-user.target.m4 \
units/remote-fs.target.m4 \
units/systemd-initctl.service.in \
units/systemd-logger.service.in \
+ units/systemd-shutdownd.service.in \
+ units/systemd-kmsg-syslogd.service.in \
+ units/systemd-modules-load.service.in \
+ units/systemd-vconsole-setup.service.in \
+ units/systemd-remount-api-vfs.service.in \
+ units/systemd-update-utmp-runlevel.service.in \
+ units/systemd-update-utmp-shutdown.service.in \
+ units/systemd-random-seed-save.service.in \
+ units/systemd-random-seed-load.service.in \
+ units/systemd-readahead-collect.service.in \
+ units/systemd-readahead-replay.service.in \
+ units/systemd-readahead-done.service.in \
+ units/systemd-tmpfiles.service.in \
+ units/systemd-user-sessions.service.in \
units/syslog.target.in \
- units/dbus.target.in \
units/session/exit.service.in \
systemd.pc.in
units/fedora/prefdm.service \
units/fedora/rc-local.service \
units/fedora/reboot.service \
- units/fedora/sysinit.service
+ units/fedora/sysinit.service \
+ units/fedora/single.service \
+ units/fedora/plymouth-quit.service \
+ units/fedora/plymouth-reboot.service \
+ units/fedora/plymouth-poweroff.service \
+ units/fedora/plymouth-halt.service
+endif
+
+if TARGET_DEBIAN
+dist_systemunit_DATA += \
+ units/debian/halt.service \
+ units/debian/killall.service \
+ units/debian/poweroff.service \
+ units/debian/reboot.service \
+ units/debian/fsck.target \
+ units/debian/umountfs.service \
+ units/debian/umountnfs.service \
+ units/debian/umountroot.service
endif
if TARGET_SUSE
dist_systemunit_DATA += \
units/suse/halt.service \
units/suse/poweroff.service \
- units/suse/reboot.service
+ units/suse/reboot.service \
+ units/suse/fsck.target
endif
if TARGET_GENTOO
LICENSE \
DISTRO_PORTING \
src/sd-daemon.h \
- src/sd-daemon.c
+ src/sd-daemon.c \
+ src/sd-readahead.h \
+ src/sd-readahead.c
pkgconfigdata_DATA = \
systemd.pc
+dist_polkitpolicy_DATA = \
+ src/org.freedesktop.systemd1.policy
+
noinst_LTLIBRARIES = \
libsystemd-basic.la \
libsystemd-core.la
libsystemd_basic_la_SOURCES = \
- src/util.c \
- src/hashmap.c \
- src/set.c \
- src/strv.c \
- src/conf-parser.c \
- src/socket-util.c \
- src/log.c \
- src/ratelimit.c
+ src/util.c \
+ src/label.c \
+ src/hashmap.c \
+ src/set.c \
+ src/strv.c \
+ src/conf-parser.c \
+ src/socket-util.c \
+ src/log.c \
+ src/ratelimit.c
+
+libsystemd_basic_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SELINUX_CFLAGS)
+
+libsystemd_basic_la_LIBADD = \
+ $(SELINUX_LIBS)
libsystemd_core_la_SOURCES = \
src/unit.c \
- src/job.c \
- src/manager.c \
+ src/job.c \
+ src/manager.c \
src/path-lookup.c \
- src/load-fragment.c \
- src/service.c \
- src/automount.c \
- src/mount.c \
- src/swap.c \
- src/device.c \
- src/target.c \
- src/snapshot.c \
- src/socket.c \
- src/timer.c \
+ src/load-fragment.c \
+ src/service.c \
+ src/automount.c \
+ src/mount.c \
+ src/swap.c \
+ src/device.c \
+ src/target.c \
+ src/snapshot.c \
+ src/socket.c \
+ src/timer.c \
src/path.c \
- src/load-dropin.c \
- src/execute.c \
- src/dbus.c \
- src/dbus-manager.c \
- src/dbus-unit.c \
- src/dbus-job.c \
+ src/load-dropin.c \
+ src/execute.c \
+ src/utmp-wtmp.c \
+ src/exit-status.c \
+ src/dbus.c \
+ src/dbus-manager.c \
+ src/dbus-unit.c \
+ src/dbus-job.c \
src/dbus-service.c \
src/dbus-socket.c \
src/dbus-timer.c \
src/hostname-setup.c \
src/loopback-setup.c \
src/kmod-setup.c \
- src/modprobe-setup.c \
- src/utmp-wtmp.c \
+ src/locale-setup.c \
src/specifier.c \
src/unit-name.c \
src/fdset.c \
src/namespace.c \
src/tcpwrap.c \
- src/cgroup-util.c
+ src/cgroup-util.c \
+ src/condition.c
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS) \
$(UDEV_CFLAGS) \
- $(CGROUP_CFLAGS)
+ $(LIBWRAP_CFLAGS) \
+ $(PAM_CFLAGS) \
+ $(AUDIT_CFLAGS)
libsystemd_core_la_LIBADD = \
libsystemd-basic.la \
$(DBUS_LIBS) \
$(UDEV_LIBS) \
- $(CGROUP_LIBS) \
$(LIBWRAP_LIBS) \
- $(PAM_LIBS)
+ $(PAM_LIBS) \
+ $(AUDIT_LIBS)
# This is needed because automake is buggy in how it generates the
# rules for C programs, but not Vala programs. We therefore can't
src/list.h \
src/securebits.h \
src/linux/auto_dev-ioctl.h \
+ src/linux/fanotify.h \
src/initreq.h \
src/sd-daemon.h \
+ src/sd-readahead.h \
src/special.h \
- src/dbus-common.h
+ src/dbus-common.h \
+ src/bus-errors.h \
+ src/cgroup-show.h \
+ src/build.h \
+ src/shutdownd.h \
+ src/readahead-common.h
MANPAGES = \
man/systemd.1 \
man/systemctl.1 \
man/systemadm.1 \
- man/systemd-install.1 \
+ man/systemd-cgls.1 \
man/systemd-notify.1 \
man/sd_notify.3 \
+ man/sd_readahead.3 \
man/sd_booted.3 \
man/sd_listen_fds.3 \
man/sd_is_fifo.3 \
man/systemd.exec.5 \
man/daemon.7 \
man/sd-daemon.7 \
+ man/sd-readahead.7 \
man/runlevel.8 \
man/telinit.8 \
man/halt.8 \
man/shutdown.8 \
- man/pam_systemd.8
+ man/pam_systemd.8 \
+ man/systemd.conf.5
MANPAGES_ALIAS = \
man/reboot.8 \
systemd_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS) \
- $(UDEV_CFLAGS) \
- $(CGROUP_CFLAGS)
+ $(UDEV_CFLAGS)
systemd_LDADD = \
libsystemd-core.la
test_loopback_LDADD = \
libsystemd-basic.la
+test_hostname_SOURCES = \
+ src/test-hostname.c \
+ src/hostname-setup.c
+
+test_hostname_LDADD = \
+ libsystemd-basic.la
+
test_daemon_SOURCES = \
src/test-daemon.c \
src/sd-daemon.c
src/cgroup-util.c
test_cgroup_CFLAGS = \
- $(AM_CFLAGS) \
- $(CGROUP_CFLAGS)
+ $(AM_CFLAGS)
test_cgroup_LDADD = \
- libsystemd-basic.la \
- $(CGROUP_LIBS)
+ libsystemd-basic.la
+
+test_env_replace_SOURCES = \
+ src/test-env-replace.c
+
+test_env_replace_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_env_replace_LDADD = \
+ libsystemd-basic.la
systemd_logger_SOURCES = \
src/logger.c \
systemd_initctl_SOURCES = \
src/initctl.c \
- src/sd-daemon.c
+ src/sd-daemon.c \
+ src/dbus-common.c
systemd_initctl_CFLAGS = \
$(AM_CFLAGS) \
libsystemd-basic.la \
$(DBUS_LIBS)
+systemd_update_utmp_SOURCES = \
+ src/update-utmp.c \
+ src/dbus-common.c \
+ src/utmp-wtmp.c
+
+systemd_update_utmp_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(AUDIT_CFLAGS)
+
+systemd_update_utmp_LDADD = \
+ libsystemd-basic.la \
+ $(DBUS_LIBS) \
+ $(AUDIT_LIBS)
+
+systemd_random_seed_SOURCES = \
+ src/random-seed.c
+
+systemd_random_seed_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_random_seed_LDADD = \
+ libsystemd-basic.la
+
+systemd_shutdownd_SOURCES = \
+ src/utmp-wtmp.c \
+ src/sd-daemon.c \
+ src/shutdownd.c
+
+systemd_shutdownd_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_shutdownd_LDADD = \
+ libsystemd-basic.la
+
+systemd_shutdown_SOURCES = \
+ src/mount-setup.c \
+ src/umount.h \
+ src/umount.c \
+ src/shutdown.c
+
+systemd_shutdown_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(UDEV_CFLAGS)
+
+systemd_shutdown_LDADD = \
+ libsystemd-basic.la \
+ $(UDEV_LIBS)
+
+systemd_modules_load_SOURCES = \
+ src/modules-load.c
+
+systemd_modules_load_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_tmpfiles_LDADD = \
+ libsystemd-basic.la
+
+systemd_tmpfiles_SOURCES = \
+ src/tmpfiles.c
+
+systemd_tmpfiles_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_user_sessions_LDADD = \
+ libsystemd-basic.la
+
+systemd_user_sessions_SOURCES = \
+ src/user-sessions.c \
+ src/cgroup-util.c
+
+systemd_user_sessions_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_modules_load_LDADD = \
+ libsystemd-basic.la
+
+systemd_vconsole_setup_SOURCES = \
+ src/vconsole-setup.c
+
+systemd_vconsole_setup_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_vconsole_setup_LDADD = \
+ libsystemd-basic.la
+
+systemd_remount_api_vfs_SOURCES = \
+ src/remount-api-vfs.c \
+ src/mount-setup.c
+
+systemd_remount_api_vfs_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_remount_api_vfs_LDADD = \
+ libsystemd-basic.la
+
systemd_cgroups_agent_SOURCES = \
- src/cgroups-agent.c
+ src/cgroups-agent.c \
+ src/dbus-common.c
systemd_cgroups_agent_CFLAGS = \
$(AM_CFLAGS) \
libsystemd-basic.la \
$(DBUS_LIBS)
+systemd_kmsg_syslogd_SOURCES = \
+ src/kmsg-syslogd.c \
+ src/sd-daemon.c \
+ src/fdset.c
+
+systemd_kmsg_syslogd_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_kmsg_syslogd_LDADD = \
+ libsystemd-basic.la
+
systemctl_SOURCES = \
src/systemctl.c \
src/utmp-wtmp.c \
- src/dbus-common.c
+ src/dbus-common.c \
+ src/path-lookup.c \
+ src/sd-daemon.c \
+ src/cgroup-show.c \
+ src/cgroup-util.c \
+ src/exit-status.c \
+ src/unit-name.c
systemctl_CFLAGS = \
$(AM_CFLAGS) \
systemd_notify_SOURCES = \
src/notify.c \
- src/sd-daemon.c
+ src/sd-daemon.c \
+ src/sd-readahead.c
systemd_notify_LDADD = \
libsystemd-basic.la
-systemd_install_SOURCES = \
- src/install.c \
- src/path-lookup.c \
- src/dbus-common.c
+systemd_ask_password_SOURCES = \
+ src/ask-password.c
+
+systemd_ask_password_LDADD = \
+ libsystemd-basic.la
+
+systemd_reply_password_SOURCES = \
+ src/reply-password.c
+
+systemd_reply_password_LDADD = \
+ libsystemd-basic.la
+
+systemd_readahead_collect_SOURCES = \
+ src/readahead-collect.c \
+ src/sd-daemon.c \
+ src/readahead-common.c
-systemd_install_LDADD = \
+systemd_readahead_collect_CFLAGS = \
+ $(UDEV_CFLAGS)
+
+systemd_readahead_collect_LDADD = \
libsystemd-basic.la \
- $(DBUS_LIBS)
+ $(UDEV_LIBS)
-systemd_install_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+systemd_readahead_replay_SOURCES = \
+ src/readahead-replay.c \
+ src/sd-daemon.c \
+ src/readahead-common.c
+
+systemd_readahead_replay_CFLAGS = \
+ $(UDEV_CFLAGS)
+
+systemd_readahead_replay_LDADD = \
+ libsystemd-basic.la \
+ $(UDEV_LIBS)
+
+systemd_cgls_SOURCES = \
+ src/cgls.c \
+ src/cgroup-show.c \
+ src/cgroup-util.c
+
+systemd_cgls_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_cgls_LDADD = \
+ libsystemd-basic.la
systemadm_SOURCES = \
src/systemadm.vala \
$(DBUSGLIB_LIBS) \
$(GTK_LIBS)
+systemd_ask_password_agent_SOURCES = \
+ src/ask-password-agent.vala
+
+systemd_ask_password_agent_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUSGLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ -Wno-unused-variable \
+ -Wno-unused-function \
+ -Wno-shadow \
+ -Wno-format-nonliteral
+
+systemd_ask_password_agent_VALAFLAGS = \
+ --pkg=dbus-glib-1 \
+ --pkg=posix \
+ --pkg=gtk+-2.0 \
+ --pkg=linux \
+ --pkg=gio-unix-2.0 \
+ --pkg=libnotify \
+ -g
+
+systemd_ask_password_agent_LDADD = \
+ $(DBUSGLIB_LIBS) \
+ $(GTK_LIBS)
+
pam_systemd_la_SOURCES = \
src/pam-module.c \
src/cgroup-util.c \
src/sd-daemon.c
pam_systemd_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(CGROUP_CFLAGS) \
+ $(AM_CFLAGS)
-fvisibility=hidden
pam_systemd_la_LDFLAGS = \
pam_systemd_la_LIBADD = \
libsystemd-basic.la \
- $(PAM_LIBS) \
- $(CGROUP_LIBS)
+ $(PAM_LIBS)
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
- -e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
+ -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
-e 's,@systemunitdir\@,$(systemunitdir),g' \
endif
org.freedesktop.systemd1.%.xml: systemd
- $(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@
+ $(AM_V_GEN)SYSTEMD_SKIP_API_MOUNTS=1 ./systemd --introspect=${@:.xml=} > $@
CLEANFILES += \
$(dbusinterface_DATA)
$(DESTDIR)$(systemunitdir) \
$(DESTDIR)$(sessionunitdir) \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
- $(DESTDIR)$(systemunitdir)/sysinit.target.wants \
+ $(DESTDIR)$(systemunitdir)/basic.target.wants \
+ $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+ $(DESTDIR)$(systemunitdir)/local-fs.target.wants \
+ $(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
+ $(DESTDIR)$(systemunitdir)/runlevel2.target.wants \
+ $(DESTDIR)$(systemunitdir)/runlevel3.target.wants \
+ $(DESTDIR)$(systemunitdir)/runlevel4.target.wants \
+ $(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
+ $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system \
$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
$(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
$(DESTDIR)$(pkgsysconfdir)/session \
$(DESTDIR)$(sysconfdir)/xdg/systemd
- $(MKDIR_P) -m 0755 $(DESTDIR)/cgroup || \
- echo "Don't forget to create /cgroup! Couldn't create it for you, continuing anyway."
( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
rm -f session && \
$(LN_S) $(pkgsysconfdir)/session session )
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
- rm -f systemd-initctl.socket systemd-logger.socket && \
+ rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket && \
$(LN_S) ../systemd-logger.socket systemd-logger.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 )
+ ( 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)/runlevel2.target.wants && \
+ rm -f systemd-update-utmp-runlevel.service && \
+ $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
+ ( cd $(DESTDIR)$(systemunitdir)/runlevel3.target.wants && \
+ rm -f systemd-update-utmp-runlevel.service && \
+ $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
+ ( cd $(DESTDIR)$(systemunitdir)/runlevel4.target.wants && \
+ rm -f systemd-update-utmp-runlevel.service && \
+ $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
+ ( cd $(DESTDIR)$(systemunitdir)/runlevel5.target.wants && \
+ rm -f systemd-update-utmp-runlevel.service && \
+ $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
+ ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
+ rm -f systemd-update-utmp-shutdown.service \
+ hwclock-save.service \
+ systemd-random-seed-save.service && \
+ $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service && \
+ $(LN_S) ../hwclock-save.service hwclock-save.service && \
+ $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
+ ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
+ rm -f systemd-remount-api-vfs.service \
+ remount-rootfs.service \
+ var-run.mount \
+ var-lock.mount && \
+ $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
+ $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
+ $(LN_S) ../var-run.mount var-run.mount && \
+ $(LN_S) ../var-lock.mount var-lock.mount )
( cd $(DESTDIR)$(sessionunitdir) && \
- rm -f shutdown.target sockets.target local-fs.target swap.target && \
+ rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
$(LN_S) $(systemunitdir)/sockets.target sockets.target && \
$(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \
- $(LN_S) $(systemunitdir)/swap.target swap.target )
+ $(LN_S) $(systemunitdir)/swap.target swap.target && \
+ $(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \
+ $(LN_S) $(systemunitdir)/printer.target printer.target)
( cd $(DESTDIR)$(systemunitdir) && \
- rm -f runlevel0.target runlevel1.target runlevel6.target && \
+ rm -f runlevel0.target runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target runlevel6.target && \
$(LN_S) poweroff.target runlevel0.target && \
$(LN_S) rescue.target runlevel1.target && \
+ $(LN_S) multi-user.target runlevel2.target && \
+ $(LN_S) multi-user.target runlevel3.target && \
+ $(LN_S) multi-user.target runlevel4.target && \
+ $(LN_S) graphical.target runlevel5.target && \
$(LN_S) reboot.target runlevel6.target )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
- rm -f default.target ctrl-alt-del.target kbrequest.target && \
- $(LN_S) $(systemunitdir)/graphical.target default.target && \
- $(LN_S) $(systemunitdir)/reboot.target ctrl-alt-del.target && \
- $(LN_S) $(systemunitdir)/rescue.target kbrequest.target && \
- rm -f runlevel2.target runlevel3.target runlevel4.target runlevel5.target && \
- $(LN_S) $(systemunitdir)/multi-user.target runlevel2.target && \
- $(LN_S) $(systemunitdir)/multi-user.target runlevel3.target && \
- $(LN_S) $(systemunitdir)/multi-user.target runlevel4.target && \
- $(LN_S) $(systemunitdir)/graphical.target runlevel5.target )
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f default.target ctrl-alt-del.target && \
+ $(LN_S) graphical.target default.target && \
+ $(LN_S) reboot.target ctrl-alt-del.target )
+ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+ rm -f getty.target systemd-user-sessions.service && \
+ $(LN_S) ../getty.target getty.target && \
+ $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
- rm -f getty.target remote-fs.target && \
- $(LN_S) $(systemunitdir)/getty.target getty.target && \
+ rm -f remote-fs.target && \
$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
- ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+ ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
rm -f dev-hugepages.automount \
dev-mqueue.automount \
proc-sys-fs-binfmt_misc.automount \
sys-kernel-debug.automount \
- sys-kernel-security.automount && \
+ sys-kernel-security.automount \
+ systemd-vconsole-setup.service \
+ systemd-modules-load.service \
+ systemd-random-seed-load.service \
+ systemd-tmpfiles.service \
+ sysctl.service \
+ tmpwatch.timer \
+ tmpwatch.service && \
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
$(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
- $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount )
+ $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
+ $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
+ $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
+ $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
+ $(LN_S) ../systemd-tmpfiles.service systemd-tmpfiles.service && \
+ $(LN_S) ../sysctl.service sysctl.service && \
+ $(LN_S) ../tmpwatch.timer tmpwatch.timer && \
+ $(LN_S) ../tmpwatch.service tmpwatch.service )
( cd $(DESTDIR)$(dbussessionservicedir) && \
rm -f org.freedesktop.systemd1.service && \
$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
if TARGET_FEDORA
$(MKDIR_P) -m 0755 \
- $(DESTDIR)$(SYSTEM_SYSVINIT_PATH)
+ $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
+ $(DESTDIR)$(systemunitdir)/reboot.target.wants \
+ $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
+ $(DESTDIR)$(systemunitdir)/halt.target.wants \
+ $(DESTDIR)$(systemunitdir)/rescue.target.wants \
+ $(DESTDIR)$(systemunitdir)/multi-user.target.wants
( cd $(DESTDIR)$(pkgsysconfdir)/system && \
rm -f display-manager.service && \
$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
rm -f prefdm.service && \
- $(LN_S) ../prefdm.service prefdm.service )
+ $(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
rm -f rc-local.service && \
$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+ ( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
+ rm -f single.service && \
+ $(LN_S) $(systemunitdir)/single.service single.service )
+ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+ rm -f plymouth-quit.service && \
+ $(LN_S) ../plymouth-quit.service plymouth-quit.service )
+ ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
+ rm -f plymouth-reboot.service && \
+ $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
+ ( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
+ rm -f plymouth-poweroff.service && \
+ $(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
+ ( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
+ rm -f plymouth-halt.service && \
+ $(LN_S) ../plymouth-halt.service plymouth-halt.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f local.service && \
$(LN_S) rc-local.service local.service )
rm -f display-manager.service && \
$(LN_S) $(systemunitdir)/xdm.service display-manager.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
- rm -f prefdm.service && \
- $(LN_S) ../prefdm.service prefdm.service )
+ rm -f xdm.service && \
+ $(LN_S) $(systemunitdir)/xdm.service xdm.service )
+endif
+if TARGET_DEBIAN
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/umount.target.wants
+ ( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
+ rm -f umountfs.service umountnfs.service umountroot.service && \
+ $(LN_S) ../umountfs.service umountfs.service && \
+ $(LN_S) ../umountnfs.service umountnfs.service && \
+ $(LN_S) ../umountroot.service umountroot.service )
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f runlevel5.target && \
+ $(LN_S) multi-user.target runlevel5.target )
+endif
+if !TARGET_SUSE
+if !TARGET_DEBIAN
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f fsck.target && \
+ $(LN_S) sysinit.target fsck.target )
+endif
endif
DISTCHECK_CONFIGURE_FLAGS = \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
--with-rootdir=$$dc_install_base/$(rootdir)
+
+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/
+ scp man/*.html tango:public/systemd-man/
+
+git-tag:
+ git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+# Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
+fedora: install
+ rm /lib/systemd/system/local-fs.target.wants/var-run.mount
+ rm /lib/systemd/system/local-fs.target.wants/var-lock.mount
~ianmdlvl / elogind.git / blobdiff