X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=5847bb4ae4f9a79e223f65cda58881c2a679af81;hp=51c6d33af04ca93453ab6bdf93038b6aae892782;hb=ea24d8d1383e038d6b6e599d42c0114b3dbd8acb;hpb=484122c3458ae5ff5236dd4a6e6ddffcffa08336 diff --git a/Makefile.am b/Makefile.am index 51c6d33af..5847bb4ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -111,7 +111,7 @@ catalogdir=$(prefix)/lib/systemd/catalog kernelinstalldir = $(prefix)/lib/kernel/install.d factory_etcdir = $(prefix)/share/factory/etc factory_pamdir = $(prefix)/share/factory/etc/pam.d -sd_bootlibdir = $(prefix)/lib/systemd/sd-boot +bootlibdir = $(prefix)/lib/systemd/boot/efi # And these are the special ones for / rootprefix=@rootprefix@ @@ -199,6 +199,7 @@ AM_CPPFLAGS = \ -DKEXEC=\"$(KEXEC)\" \ -DLIBDIR=\"$(libdir)\" \ -DROOTLIBDIR=\"$(rootlibdir)\" \ + -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ -I $(top_srcdir)/src \ -I $(top_builddir)/src/shared \ @@ -242,14 +243,11 @@ endef INSTALL_DIRS = -RUNLEVEL1_TARGET_WANTS = -RUNLEVEL2_TARGET_WANTS = -RUNLEVEL3_TARGET_WANTS = -RUNLEVEL4_TARGET_WANTS = -RUNLEVEL5_TARGET_WANTS = SHUTDOWN_TARGET_WANTS = LOCAL_FS_TARGET_WANTS = MULTI_USER_TARGET_WANTS = +GRAPHICAL_TARGET_WANTS = +RESCUE_TARGET_WANTS = SYSINIT_TARGET_WANTS = SOCKETS_TARGET_WANTS = BUSNAMES_TARGET_WANTS = @@ -263,14 +261,11 @@ USER_UNIT_ALIASES = GENERAL_ALIASES = install-target-wants-hook: - what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && dir=$(systemunitdir) && $(add-wants) - what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && dir=$(systemunitdir) && $(add-wants) - what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && dir=$(systemunitdir) && $(add-wants) - what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && dir=$(systemunitdir) && $(add-wants) - what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && dir=$(systemunitdir) && $(add-wants) what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants) what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants) what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants) + what="$(GRAPHICAL_TARGET_WANTS)" && wants=graphical.target && dir=$(systemunitdir) && $(add-wants) + what="$(RESCUE_TARGET_WANTS)" && wants=rescue.target && dir=$(systemunitdir) && $(add-wants) what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants) what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants) what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants) @@ -391,13 +386,15 @@ rootlibexec_PROGRAMS = \ systemd-remount-fs \ systemd-reply-password \ systemd-fsck \ + systemd-fsckd \ systemd-machine-id-commit \ systemd-ac-power \ systemd-sysctl \ systemd-sleep \ systemd-bus-proxyd \ systemd-socket-proxyd \ - systemd-update-done + systemd-update-done \ + systemd-user-sessions if HAVE_UTMP rootlibexec_PROGRAMS += \ @@ -493,6 +490,7 @@ dist_systemunit_DATA = \ units/slices.target \ units/system.slice \ units/x-.slice \ + units/systemd-fsckd.socket \ units/systemd-initctl.socket \ units/systemd-shutdownd.socket \ units/syslog.socket \ @@ -502,6 +500,7 @@ dist_systemunit_DATA = \ units/sys-kernel-debug.mount \ units/sys-fs-fuse-connections.mount \ units/tmp.mount \ + units/var-lib-machines.mount \ units/printer.target \ units/sound.target \ units/bluetooth.target \ @@ -544,6 +543,7 @@ nodist_systemunit_DATA = \ units/systemd-kexec.service \ units/systemd-fsck@.service \ units/systemd-fsck-root.service \ + units/systemd-fsckd.service \ units/systemd-machine-id-commit.service \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ @@ -555,7 +555,8 @@ nodist_systemunit_DATA = \ units/initrd-udevadm-cleanup-db.service \ units/initrd-switch-root.service \ units/systemd-nspawn@.service \ - units/systemd-update-done.service + units/systemd-update-done.service \ + units/systemd-user-sessions.service if HAVE_UTMP nodist_systemunit_DATA += \ @@ -597,6 +598,7 @@ EXTRA_DIST += \ units/user/systemd-exit.service.in \ units/systemd-fsck@.service.in \ units/systemd-fsck-root.service.in \ + units/systemd-fsckd.service.in \ units/systemd-machine-id-commit.service.in \ units/user@.service.m4.in \ units/debug-shell.service.in \ @@ -607,7 +609,8 @@ EXTRA_DIST += \ units/initrd-udevadm-cleanup-db.service.in \ units/initrd-switch-root.service.in \ units/systemd-nspawn@.service.in \ - units/systemd-update-done.service.in + units/systemd-update-done.service.in \ + units/systemd-user-sessions.service.in CLEANFILES += \ units/console-shell.service.m4 \ @@ -2122,6 +2125,13 @@ systemd_update_done_LDADD = \ libsystemd-label.la \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_user_sessions_SOURCES = \ + src/user-sessions/user-sessions.c + +systemd_user_sessions_LDADD = \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ src/shutdownd/shutdownd.c @@ -2356,6 +2366,18 @@ systemd_fsck_LDADD = \ libudev-internal.la \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_fsckd_SOURCES = \ + src/fsckd/fsckd.c \ + $(NULL) + +systemd_fsckd_LDADD = \ + libsystemd-internal.la \ + libsystemd-label.la \ + libsystemd-shared.la \ + libudev-internal.la \ + $(NULL) + # ------------------------------------------------------------------------------ systemd_machine_id_commit_SOURCES = \ src/machine-id-commit/machine-id-commit.c \ @@ -2478,13 +2500,14 @@ systemd_efi_boot_generator_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ +if HAVE_BLKID bootctl_SOURCES = \ src/boot/bootctl.c bootctl_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DEFI_MACHINE_TYPE_NAME=\"$(EFI_MACHINE_TYPE_NAME)\" \ - -DSD_BOOTLIBDIR=\"$(sd_bootlibdir)\" + -DBOOTLIBDIR=\"$(bootlibdir)\" bootctl_CFLAGS = \ $(AM_CFLAGS) \ @@ -2503,6 +2526,7 @@ dist_bashcompletion_DATA += \ dist_zshcompletion_DATA += \ shell-completion/zsh/_bootctl +endif # ------------------------------------------------------------------------------ if HAVE_GNUEFI @@ -2517,6 +2541,7 @@ efi_cflags = \ $(EFI_CFLAGS) \ -Wall \ -Wextra \ + -std=gnu90 \ -nostdinc \ -ggdb -O0 \ -fpic \ @@ -2547,63 +2572,67 @@ efi_ldflags = \ $(EFI_LDS_DIR)/crt0-efi-$(EFI_ARCH).o # ------------------------------------------------------------------------------ -sd_boot_headers = \ - src/sd-boot/util.h \ - src/sd-boot/console.h \ - src/sd-boot/graphics.h \ - src/sd-boot/pefile.h - -sd_boot_sources = \ - src/sd-boot/util.c \ - src/sd-boot/console.c \ - src/sd-boot/graphics.c \ - src/sd-boot/pefile.c \ - src/sd-boot/sd-boot.c - -sd_boot_objects = $(addprefix $(top_builddir)/,$(sd_boot_sources:.c=.o)) -sd_boot_solib = $(top_builddir)/src/sd-boot/sd_boot.so -sd_boot = sd-boot$(EFI_MACHINE_TYPE_NAME).efi - -sd_bootlib_DATA = $(sd_boot) -CLEANFILES += $(sd_boot_objects) $(sd_boot_solib) $(sd_boot) -EXTRA_DIST += $(sd_boot_sources) $(sd_boot_headers) - -$(top_builddir)/src/sd-boot/%.o: $(top_srcdir)/src/sd-boot/%.c $(addprefix $(top_srcdir)/,$(sd_boot_headers)) - @$(MKDIR_P) $(top_builddir)/src/sd-boot/ +systemd_boot_headers = \ + src/boot/efi/util.h \ + src/boot/efi/console.h \ + src/boot/efi/graphics.h \ + src/boot/efi/pefile.h + +systemd_boot_sources = \ + src/boot/efi/util.c \ + src/boot/efi/console.c \ + src/boot/efi/graphics.c \ + src/boot/efi/pefile.c \ + src/boot/efi/boot.c + +systemd_boot_objects = $(addprefix $(top_builddir)/,$(systemd_boot_sources:.c=.o)) +systemd_boot_solib = $(top_builddir)/src/boot/efi/systemd_boot.so +systemd_boot = systemd-boot$(EFI_MACHINE_TYPE_NAME).efi + +bootlib_DATA = $(systemd_boot) +CLEANFILES += $(systemd_boot_objects) $(systemd_boot_solib) $(systemd_boot) +EXTRA_DIST += $(systemd_boot_sources) $(systemd_boot_headers) + +$(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(systemd_boot_headers)) + @$(MKDIR_P) $(top_builddir)/src/boot/efi/ $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ -$(sd_boot_solib): $(sd_boot_objects) - $(AM_V_CCLD)$(LD) $(efi_ldflags) $(sd_boot_objects) \ +$(systemd_boot_solib): $(systemd_boot_objects) + $(AM_V_CCLD)$(LD) $(efi_ldflags) $(systemd_boot_objects) \ -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ nm -D -u $@ | grep ' U ' && exit 1 || : -$(sd_boot): $(sd_boot_solib) +$(systemd_boot): $(systemd_boot_solib) $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \ -j .dynsym -j .rel -j .rela -j .reloc \ --target=efi-app-$(EFI_ARCH) $< $@ # ------------------------------------------------------------------------------ stub_headers = \ - src/sd-boot/util.h \ - src/sd-boot/pefile.h \ - src/sd-boot/linux.h + src/boot/efi/util.h \ + src/boot/efi/pefile.h \ + src/boot/efi/graphics.h \ + src/boot/efi/splash.h \ + src/boot/efi/linux.h stub_sources = \ - src/sd-boot/util.c \ - src/sd-boot/pefile.c \ - src/sd-boot/linux.c \ - src/sd-boot/stub.c + src/boot/efi/util.c \ + src/boot/efi/pefile.c \ + src/boot/efi/graphics.c \ + src/boot/efi/splash.c \ + src/boot/efi/linux.c \ + src/boot/efi/stub.c stub_objects = $(addprefix $(top_builddir)/,$(stub_sources:.c=.o)) -stub_solib = $(top_builddir)/src/sd-boot/stub.so +stub_solib = $(top_builddir)/src/boot/efi/stub.so stub = linux$(EFI_MACHINE_TYPE_NAME).efi.stub -sd_bootlib_DATA += $(stub) +bootlib_DATA += $(stub) CLEANFILES += $(stub_objects) $(stub_solib) $(stub) EXTRA_DIST += $(stub_sources) $(stub_headers) -$(top_builddir)/src/sd-boot/%.o: $(top_srcdir)/src/sd-boot/%.c $(addprefix $(top_srcdir)/,$(stub_headers)) - @$(MKDIR_P) $(top_builddir)/src/sd-boot/ +$(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(stub_headers)) + @$(MKDIR_P) $(top_builddir)/src/boot/efi/ $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ $(stub_solib): $(stub_objects) @@ -2620,7 +2649,7 @@ $(stub): $(stub_solib) CLEANFILES += test-efi-disk.img EXTRA_DIST += test/test-efi-create-disk.sh -test-efi-disk.img: $(sd_boot) $(stub) test/test-efi-create-disk.sh +test-efi-disk.img: $(systemd_boot) $(stub) test/test-efi-create-disk.sh $(AM_V_GEN)test/test-efi-create-disk.sh test-efi: test-efi-disk.img @@ -5888,15 +5917,8 @@ endif noinst_LTLIBRARIES += \ libsystemd-logind-core.la -systemd_user_sessions_SOURCES = \ - src/login/user-sessions.c - -systemd_user_sessions_LDADD = \ - libsystemd-shared.la - rootlibexec_PROGRAMS += \ - systemd-logind \ - systemd-user-sessions + systemd-logind loginctl_SOURCES = \ src/login/loginctl.c \ @@ -5996,8 +6018,7 @@ dist_pamconf_DATA = \ endif nodist_systemunit_DATA += \ - units/systemd-logind.service \ - units/systemd-user-sessions.service + units/systemd-logind.service dist_systemunit_DATA += \ units/user.slice @@ -6021,8 +6042,7 @@ INSTALL_DIRS += \ $(systemdstatedir) MULTI_USER_TARGET_WANTS += \ - systemd-logind.service \ - systemd-user-sessions.service + systemd-logind.service SYSTEM_UNIT_ALIASES += \ systemd-logind.service dbus-org.freedesktop.login1.service @@ -6051,8 +6071,7 @@ EXTRA_DIST += \ src/login/logind-gperf.gperf \ src/login/71-seat.rules.in \ src/login/73-seat-late.rules.in \ - units/systemd-logind.service.in \ - units/systemd-user-sessions.service.in + units/systemd-logind.service.in # ------------------------------------------------------------------------------ if HAVE_PYTHON_DEVEL @@ -6555,15 +6574,11 @@ SOCKETS_TARGET_WANTS += \ if HAVE_UTMP if HAVE_SYSV_COMPAT -RUNLEVEL1_TARGET_WANTS += \ - systemd-update-utmp-runlevel.service -RUNLEVEL2_TARGET_WANTS += \ - systemd-update-utmp-runlevel.service -RUNLEVEL3_TARGET_WANTS += \ +MULTI_USER_TARGET_WANTS += \ systemd-update-utmp-runlevel.service -RUNLEVEL4_TARGET_WANTS += \ +GRAPHICAL_TARGET_WANTS += \ systemd-update-utmp-runlevel.service -RUNLEVEL5_TARGET_WANTS += \ +RESCUE_TARGET_WANTS += \ systemd-update-utmp-runlevel.service endif @@ -6576,11 +6591,13 @@ SYSINIT_TARGET_WANTS += \ LOCAL_FS_TARGET_WANTS += \ systemd-remount-fs.service \ - tmp.mount + tmp.mount \ + var-lib-machines.mount MULTI_USER_TARGET_WANTS += \ getty.target \ - systemd-ask-password-wall.path + systemd-ask-password-wall.path \ + systemd-user-sessions.service SYSINIT_TARGET_WANTS += \ dev-hugepages.mount \