chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
factory: install minimal PAM and nsswitch config
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index f0482cfe72c76131792376163583873c1170cd0c..9f2900cb6f14c821b370c764919420ec02df045f 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-106,6
+106,8
@@
udevrulesdir=$(udevlibexecdir)/rules.d
udevhwdbdir=$(udevlibexecdir)/hwdb.d
catalogdir=$(prefix)/lib/systemd/catalog
kernelinstalldir = $(prefix)/lib/kernel/install.d
udevhwdbdir=$(udevlibexecdir)/hwdb.d
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
# And these are the special ones for /
rootprefix=@rootprefix@
# And these are the special ones for /
rootprefix=@rootprefix@
@@
-189,6
+191,7
@@
AM_CPPFLAGS = \
-DKEXEC=\"$(KEXEC)\" \
-DLIBDIR=\"$(libdir)\" \
-DROOTLIBDIR=\"$(rootlibdir)\" \
-DKEXEC=\"$(KEXEC)\" \
-DLIBDIR=\"$(libdir)\" \
-DROOTLIBDIR=\"$(rootlibdir)\" \
+ -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
-I $(top_srcdir)/src \
-I $(top_builddir)/src/shared \
-I $(top_srcdir)/src/shared \
-I $(top_srcdir)/src \
-I $(top_builddir)/src/shared \
-I $(top_srcdir)/src/shared \
@@
-406,6
+409,8
@@
dist_zshcompletion_DATA = \
shell-completion/zsh/_systemd-analyze \
shell-completion/zsh/_systemd-run \
shell-completion/zsh/_sd_hosts_or_user_at_host \
shell-completion/zsh/_systemd-analyze \
shell-completion/zsh/_systemd-run \
shell-completion/zsh/_sd_hosts_or_user_at_host \
+ shell-completion/zsh/_sd_outputmodes \
+ shell-completion/zsh/_sd_unit_files \
shell-completion/zsh/_systemd-delta \
shell-completion/zsh/_systemd
shell-completion/zsh/_systemd-delta \
shell-completion/zsh/_systemd
@@
-1223,14
+1228,13
@@
CLEANFILES += \
src/core/org.freedesktop.systemd1.policy.in
# ------------------------------------------------------------------------------
src/core/org.freedesktop.systemd1.policy.in
# ------------------------------------------------------------------------------
+
manual_tests += \
manual_tests += \
- test-engine \
test-ns \
test-loopback \
test-hostname \
test-daemon \
test-cgroup \
test-ns \
test-loopback \
test-hostname \
test-daemon \
test-cgroup \
- test-cgroup-mask \
test-install \
test-watchdog \
test-log \
test-install \
test-watchdog \
test-log \
@@
-1242,6
+1246,8
@@
manual_tests += \
endif
tests += \
endif
tests += \
+ test-engine \
+ test-cgroup-mask \
test-job-type \
test-env-replace \
test-strbuf \
test-job-type \
test-env-replace \
test-strbuf \
@@
-1722,11
+1728,19
@@
endif
# ------------------------------------------------------------------------------
systemd_analyze_SOURCES = \
# ------------------------------------------------------------------------------
systemd_analyze_SOURCES = \
- src/analyze/analyze.c
+ src/analyze/analyze.c \
+ src/analyze/analyze-verify.c \
+ src/analyze/analyze-verify.h
+
+systemd_verify_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
systemd_analyze_LDADD = \
systemd_analyze_LDADD = \
+ libsystemd-core.la \
libsystemd-internal.la \
libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ $(RT_LIBS)
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
@@
-1755,6
+1769,7
@@
systemd_update_done_SOURCES = \
systemd_update_done_LDADD = \
libsystemd-internal.la \
systemd_update_done_LDADD = \
libsystemd-internal.la \
+ libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@
-1914,6
+1929,14
@@
INSTALL_DIRS += \
$(sysusersdir)
endif
$(sysusersdir)
endif
+# ------------------------------------------------------------------------------
+dist_factory_etc_DATA = \
+ factory/etc/nsswitch.conf
+
+dist_factory_pam_DATA = \
+ factory/etc/pam.d/system-auth \
+ factory/etc/pam.d/other
+
# ------------------------------------------------------------------------------
if ENABLE_FIRSTBOOT
systemd_firstboot_SOURCES = \
# ------------------------------------------------------------------------------
if ENABLE_FIRSTBOOT
systemd_firstboot_SOURCES = \
@@
-1938,7
+1961,6
@@
EXTRA_DIST += \
SYSINIT_TARGET_WANTS += \
systemd-firstboot.service
SYSINIT_TARGET_WANTS += \
systemd-firstboot.service
-
endif
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-2898,11
+2920,12
@@
test_unifont_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
-update-unifont:
- $(AM_V_GEN)cat $(top_srcdir)/src/libsystemd-terminal/unifont.hex | $(PYTHON) $(top_srcdir)/tools/compile-unifont.py >$(top_srcdir)/src/libsystemd-terminal/unifont-glyph-array.bin
- @echo "unifont-glyph-array.bin has been regenerated"
-
.PHONY: update-unifont
.PHONY: update-unifont
+update-unifont: tools/compile-unifont.py
+ $(AM_V_GEN)$(PYTHON) $< \
+ <$(top_srcdir)/src/libsystemd-terminal/unifont.hex \
+ >$(top_srcdir)/src/libsystemd-terminal/unifont-glyph-array.bin
+ @echo "unifont-glyph-array.bin has been regenerated"
# ------------------------------------------------------------------------------
if ENABLE_GTK_DOC
# ------------------------------------------------------------------------------
if ENABLE_GTK_DOC
@@
-4072,9
+4095,6
@@
dist_bashcompletion_DATA += \
dist_zshcompletion_DATA += \
shell-completion/zsh/_coredumpctl
dist_zshcompletion_DATA += \
shell-completion/zsh/_coredumpctl
-GENERAL_ALIASES += \
- $(bindir)/coredumpctl $(bindir)/systemd-coredumpctl
-
sysctl_DATA = \
sysctl.d/50-coredump.conf
sysctl_DATA = \
sysctl.d/50-coredump.conf
@@
-4437,9
+4457,6
@@
dist_pkgdata_DATA += \
dist_noinst_SCRIPT = \
src/locale/generate-kbd-model-map
dist_noinst_SCRIPT = \
src/locale/generate-kbd-model-map
-update-kbd-model-map: src/locale/generate-kbd-model-map
- $PYTHON $< >src/locale/kbd-model-map
-
localectl_SOURCES = \
src/locale/localectl.c
localectl_SOURCES = \
src/locale/localectl.c
@@
-4554,7
+4571,7
@@
nodist_systemunit_DATA += \
units/systemd-timesyncd.service
GENERAL_ALIASES += \
units/systemd-timesyncd.service
GENERAL_ALIASES += \
- $(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/
multi-user
.target.wants/systemd-timesyncd.service
+ $(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/
sysinit
.target.wants/systemd-timesyncd.service
EXTRA_DIST += \
units/systemd-timesyncd.service.in
EXTRA_DIST += \
units/systemd-timesyncd.service.in
@@
-4699,6
+4716,12
@@
systemd_resolved_SOURCES = \
src/resolve/resolved-link.c \
src/resolve/resolved-dns-domain.h \
src/resolve/resolved-dns-domain.c \
src/resolve/resolved-link.c \
src/resolve/resolved-dns-domain.h \
src/resolve/resolved-dns-domain.c \
+ src/resolve/resolved-dns-rr.h \
+ src/resolve/resolved-dns-rr.c \
+ src/resolve/resolved-dns-question.h \
+ src/resolve/resolved-dns-question.c \
+ src/resolve/resolved-dns-answer.h \
+ src/resolve/resolved-dns-answer.c \
src/resolve/resolved-dns-packet.h \
src/resolve/resolved-dns-packet.c \
src/resolve/resolved-dns-query.h \
src/resolve/resolved-dns-packet.h \
src/resolve/resolved-dns-packet.c \
src/resolve/resolved-dns-query.h \
@@
-4707,8
+4730,6
@@
systemd_resolved_SOURCES = \
src/resolve/resolved-dns-scope.c \
src/resolve/resolved-dns-server.h \
src/resolve/resolved-dns-server.c \
src/resolve/resolved-dns-scope.c \
src/resolve/resolved-dns-server.h \
src/resolve/resolved-dns-server.c \
- src/resolve/resolved-dns-rr.h \
- src/resolve/resolved-dns-rr.c \
src/resolve/resolved-dns-cache.h \
src/resolve/resolved-dns-cache.c
src/resolve/resolved-dns-cache.h \
src/resolve/resolved-dns-cache.c
~ianmdlvl / elogind.git / blobdiff