diff options
24 files changed, 111 insertions, 48 deletions
diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk index 4f82baed90..dfb8fa5b06 100644 --- a/build-aux/Makefile.each.tail/20-systemd.mk +++ b/build-aux/Makefile.each.tail/20-systemd.mk @@ -48,7 +48,7 @@ _systemd.link_files = $(call _systemd.lt_filter,$(filter %.o %.lo %.la,$^)) $(ca $(outdir)/%.la: @if test $(words $^) = 0; then echo 'Cannot link library with no dependencies: $@' >&2; exit 1; fi $(AM_V_CCLD)$(LINK) $(if $(_systemd.rpath),-rpath $(_systemd.rpath)) $(_systemd.link_files) -$(addprefix $(outdir)/,$(bin_PROGRAMS) $(libexec_PROGRAMS)): $(outdir)/%: +$(addprefix $(outdir)/,$(foreach d,$(am.bindirs),$($d_PROGRAMS))): $(outdir)/%: @if test $(words $^) = 0; then echo 'Cannot link executable with no dependencies: $@' >&2; exit 1; fi $(AM_V_CCLD)$(LINK) $(_systemd.link_files) diff --git a/build-aux/Makefile.each.tail/30-automake2autothing.mk b/build-aux/Makefile.each.tail/30-automake2autothing.mk index 3c8918aa7a..a74e247339 100644 --- a/build-aux/Makefile.each.tail/30-automake2autothing.mk +++ b/build-aux/Makefile.each.tail/30-automake2autothing.mk @@ -1,9 +1,12 @@ std.out_files += $(noinst_LTLIBRARIES) $(lib_LTLIBRARIES) std.sys_files += $(addprefix $(libdir)/,$(lib_LTLIBRARIES)) -std.out_files += $(bin_PROGRAMS) $(libexec_PROGRAMS) -std.sys_files += $(addprefix $(bindir)/,$(bin_PROGRAMS)) -std.sys_files += $(addprefix $(libexecdir)/,$(libexec_PROGRAMS)) +_programs = +$(foreach d,$(am.bindirs), \ + $(eval _programs += $($d_PROGRAMS) )\ + $(eval std.sys_files += $(addprefix $($(d)dir)/,$($d_PROGRAMS)) )) +std.out_files += $(_programs) +# TODO: noinst_PROGRAMS (test) std.out_files += $(notdir $(pkgconfiglib_DATA)) std.sys_files += $(addprefix $(pkgconfiglibdir)/,$(notdir $(pkgconfiglib_DATA))) @@ -23,7 +26,7 @@ $(foreach t,$(filter %.la,$(std.out_files)), $(eval $t: private ALL_LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )\ $(eval $(outdir)/$t: $($t.DEPENDS) )\ $(eval at.depdirs += $(abspath $(sort $(dir $(filter-out -l% /%,$($t.DEPENDS))))) )) -$(foreach t,$(bin_PROGRAMS) $(libexec_PROGRAMS), \ +$(foreach t,$(_programs), \ $(eval $t.DEPENDS += $(call at.path,$(call automake_o,$t) $(call automake_lib,$t,LDADD)) )\ $(eval am.CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS) $(call automake_cpp,$t,LDADD) )\ $(eval am.CFLAGS += $($(call automake_name,$t)_CFLAGS) )\ diff --git a/build-aux/Makefile.once.head/30-automake2autothing.mk b/build-aux/Makefile.once.head/30-automake2autothing.mk index 9b05224d1c..529cc97326 100644 --- a/build-aux/Makefile.once.head/30-automake2autothing.mk +++ b/build-aux/Makefile.once.head/30-automake2autothing.mk @@ -1,6 +1,7 @@ +am.bindirs = bin rootbin libexec rootlibexec systemgenerator udevlibexec at.dirlocal += am.CFLAGS am.CPPFLAGS am.LDFLAGS am.LIBTOOLFLAGS at.dirlocal += noinst_LTLIBRARIES lib_LTLIBRARIES -at.dirlocal += bin_PROGRAMS libexec_PROGRAMS +at.dirlocal += $(addsuffix _PROGRAMS,$(am.bindirs)) at.dirlocal += pkgconfiglib_DATA automake_name = $(subst -,_,$(subst .,_,$1)) automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES))) diff --git a/config.mk.in b/config.mk.in index 51075b68a3..dd7f3d4844 100644 --- a/config.mk.in +++ b/config.mk.in @@ -95,11 +95,11 @@ factory_pamdir = $(datadir)/factory/etc/pam.d bootlibdir = $(prefix)/lib/systemd/boot/efi # And these are the special ones for / -prefix=@prefix@ -bindir=$(prefix)/bin -libexecdir=$(prefix)/lib/systemd +rootprefix=@rootprefix@ +rootbindir=$(rootprefix)/bin +rootlibexecdir=$(rootprefix)/lib/systemd -# Libraries we depend on +# Libraries we provide libbasic.CPPFLAGS = -I$(topsrcdir)/src/libbasic -I$(topoutdir)/src/libbasic libbasic.DEPENDS = $(topoutdir)/src/libbasic/libbasic.la libcore.CPPFLAGS = -I$(topsrcdir)/src/libcore $(libshared.CPPFLAGS) @@ -120,36 +120,28 @@ libudev.CPPFLAGS = -I$(topsrcdir)/src/libudev/include libudev.DEPENDS = $(topoutdir)/src/libudev/src/libudev.la libudev-internal.CPPFLAGS = $(libudev.CPPFLAGS) libudev-internal.DEPENDS = $(topoutdir)/src/libudev/src/libudev-internal.la -# # -core libs -# libbus-proxy-core.CPPFLAGS = -# libbus-proxy-core.DEPENDS = -# libjournal-core.CPPFLAGS = -# libjournal-core.DEPENDS = -# liblogind-core.CPPFLAGS = -# liblogind-core.DEPENDS = -# libmachine-core.CPPFLAGS = -# libmachine-core.DEPENDS = -# libnetworkd-core.CPPFLAGS = -# libnetworkd-core.DEPENDS = -# libudev-core.CPPFLAGS = -# libudev-core.DEPENDS = -# # compat-libs -# libsystemd-daemon.CPPFLAGS = -# libsystemd-daemon.DEPENDS = -# libsystemd-id128.CPPFLAGS = -# libsystemd-id128.DEPENDS = -# libsystemd-journal.CPPFLAGS = -# libsystemd-journal.DEPENDS = -# libsystemd-login.CPPFLAGS = -# libsystemd-login.DEPENDS = -# # NSS modules -# libnss_myhostname.CPPFLAGS = -# libnss_myhostname.DEPENDS = -# libnss_mymachines.CPPFLAGS = -# libnss_mymachines.DEPENDS = -# libnss_resolve.CPPFLAGS = -# libnss_resolve.DEPENDS = +# -core libs +#libbus-proxy-core.CPPFLAGS = +#libbus-proxy-core.DEPENDS = +#libjournal-core.CPPFLAGS = +#libjournal-core.DEPENDS = +#liblogind-core.CPPFLAGS = +#liblogind-core.DEPENDS = +#libmachine-core.CPPFLAGS = +#libmachine-core.DEPENDS = +#libnetworkd-core.CPPFLAGS = +#libnetworkd-core.DEPENDS = +libudev-core.CPPFLAGS = -I$(topoutdir)/src/grp-udev/libudev-core $(libsystemd-network.CPPFLAGS) $(libshared.CPPFLAGS) +libudev-core.DEPENDS = $(topoutdir)/src/grp-udev/libudev-core/libudev-core.la +# NSS modules +#libnss_myhostname.CPPFLAGS = +#libnss_myhostname.DEPENDS = +#libnss_mymachines.CPPFLAGS = +#libnss_mymachines.DEPENDS = +#libnss_resolve.CPPFLAGS = +#libnss_resolve.DEPENDS = +# Libraries we use HAVE_ACL = @HAVE_ACL_TRUE@1 ACL_CFLAGS = #XXX ACL_LIBS = @ACL_LIBS@ @@ -235,6 +227,7 @@ HAVE_ZLIB = @HAVE_ZLIB_TRUE@1 ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ +# Other stuff AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ARCH_AARCH64 = @ARCH_AARCH64_TRUE@1 @@ -348,6 +341,8 @@ NTP_SERVERS = @NTP_SERVERS@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ + +# FIXME: hardcoded PATH_SEPARATOR = : PKG_CONFIG_LIBDIR = PKG_CONFIG_PATH = /home/luke/.prefix/lib/pkgconfig diff --git a/src/Makefile b/src/Makefile index b3c3bffb80..2048196700 100644 --- a/src/Makefile +++ b/src/Makefile @@ -37,6 +37,7 @@ at.subdirs += grp-coredump at.subdirs += grp-resolve #at.subdirs += grp-system at.subdirs += grp-timedate +at.subdirs += grp-udev at.subdirs += kernel-install at.subdirs += libbasic at.subdirs += libcore @@ -96,6 +97,5 @@ at.subdirs += systemd-update-done at.subdirs += systemd-update-utmp at.subdirs += systemd-user-sessions at.subdirs += systemd-vconsole -#at.subdirs += udev include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/Makefile b/src/grp-udev/Makefile index cc85f0317f..f6c3b1ceb4 100644 --- a/src/grp-udev/Makefile +++ b/src/grp-udev/Makefile @@ -69,4 +69,7 @@ SYSINIT_TARGET_WANTS += \ systemd-udevd.service \ systemd-udev-trigger.service +at.subdirs += systemd-udevd udevadm +at.subdirs += ata_id cdrom_id collect mtd_probe scsi_id v4l_id + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile index 34137d8494..56efd36aa6 100644 --- a/src/grp-udev/libudev-core/Makefile +++ b/src/grp-udev/libudev-core/Makefile @@ -27,19 +27,18 @@ noinst_LTLIBRARIES += \ libudev-core.la $(outdir)/keyboard-keys-list.txt: - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@ + $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@ -$(outdir)/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt +$(outdir)/keyboard-keys-from-name.gperf: $(outdir)/keyboard-keys-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@ -$(outdir)/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf +$(outdir)/keyboard-keys-from-name.h: $(outdir)/keyboard-keys-from-name.gperf $(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@ gperf_txt_sources += \ src/udev/keyboard-keys-list.txt -libudev_core_la_SOURCES = \ +_libudev_core_la_SOURCES = \ src/udev/udev.h \ src/udev/udev-event.c \ src/udev/udev-watch.c \ @@ -60,7 +59,7 @@ libudev_core_la_SOURCES = \ src/udev/net/ethtool-util.h \ src/udev/net/ethtool-util.c -nodist_libudev_core_la_SOURCES = \ +_nodist_libudev_core_la_SOURCES = \ src/udev/keyboard-keys-from-name.h \ src/udev/net/link-config-gperf.c @@ -99,4 +98,12 @@ libudev_core_la_SOURCES += \ src/systemd/sd-login.h endif # HAVE_ACL +libudev-core.la.SOURCES = $(patsubst src/udev/%,%,$(filter %.c,$(_libudev_core_la_SOURCES) $(_nodist_libudev_core_la_SOURCES))) +libudev-core.la.DEPENDS = $(addprefix $(outdir)/,$(libudev-core.la.SOURCES:.c=.lo)) +at.subdirs += net +$(outdir)/udev-builtin-keyboard.lo: $(outdir)/keyboard-keys-from-name.h +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-netlink +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb +systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/libudev-core/logind-acl.c b/src/grp-udev/libudev-core/logind-acl.c new file mode 120000 index 0000000000..d554c77128 --- /dev/null +++ b/src/grp-udev/libudev-core/logind-acl.c @@ -0,0 +1 @@ +../../grp-login/logind-acl.c
\ No newline at end of file diff --git a/src/grp-udev/libudev-core/logind-acl.h b/src/grp-udev/libudev-core/logind-acl.h new file mode 120000 index 0000000000..0355fa2378 --- /dev/null +++ b/src/grp-udev/libudev-core/logind-acl.h @@ -0,0 +1 @@ +../../grp-login/logind-acl.h
\ No newline at end of file diff --git a/src/grp-udev/libudev-core/net/Makefile b/src/grp-udev/libudev-core/net/Makefile new file mode 100644 index 0000000000..7ff2f40349 --- /dev/null +++ b/src/grp-udev/libudev-core/net/Makefile @@ -0,0 +1,31 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. + +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +systemd.CPPFLAGS += $(libshared.CPPFLAGS) +systemd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-netlink + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/libudev-core/sd-login.c b/src/grp-udev/libudev-core/sd-login.c new file mode 120000 index 0000000000..95a6042740 --- /dev/null +++ b/src/grp-udev/libudev-core/sd-login.c @@ -0,0 +1 @@ +../../libsystemd/libsystemd-internal/sd-login/sd-login.c
\ No newline at end of file diff --git a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c index 8e47775135..62689d4be9 100644 --- a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c +++ b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c @@ -18,7 +18,7 @@ ***/ #include "alloc-util.h" -#include "link-config.h" +#include "net/link-config.h" #include "log.h" #include "udev.h" diff --git a/src/grp-udev/mtd_probe/Makefile b/src/grp-udev/mtd_probe/Makefile index d7392a8a3b..50703dddda 100644 --- a/src/grp-udev/mtd_probe/Makefile +++ b/src/grp-udev/mtd_probe/Makefile @@ -34,4 +34,6 @@ dist_udevrules_DATA += \ udevlibexec_PROGRAMS += \ mtd_probe +mtd_probe_LDADD += libbasic.la + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/systemd-udevd/udevd.c b/src/grp-udev/systemd-udevd/udevd.c index 89006e6e3a..089a7eb591 100644 --- a/src/grp-udev/systemd-udevd/udevd.c +++ b/src/grp-udev/systemd-udevd/udevd.c @@ -53,7 +53,6 @@ #include "fs-util.h" #include "hashmap.h" #include "io-util.h" -#include "netlink-util.h" #include "parse-util.h" #include "proc-cmdline.h" #include "process-util.h" diff --git a/src/grp-udev/udevadm/Makefile b/src/grp-udev/udevadm/Makefile index 0ef003fe60..58a3f8cf72 100644 --- a/src/grp-udev/udevadm/Makefile +++ b/src/grp-udev/udevadm/Makefile @@ -42,4 +42,7 @@ udevadm_SOURCES = \ udevadm_LDADD = \ libudev-core.la +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb +systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile index 2a64200397..482bdc6fa0 100644 --- a/src/systemd-cryptsetup/Makefile +++ b/src/systemd-cryptsetup/Makefile @@ -57,5 +57,6 @@ SYSINIT_TARGET_WANTS += \ endif # HAVE_LIBCRYPTSETUP systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device +systemd.CPPFLAGS += -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-dbus1-generator/Makefile b/src/systemd-dbus1-generator/Makefile index 1d7f0d1a81..a817b954e5 100644 --- a/src/systemd-dbus1-generator/Makefile +++ b/src/systemd-dbus1-generator/Makefile @@ -46,4 +46,7 @@ dist_xinitrc_SCRIPTS = \ INSTALL_EXEC_HOOKS += dbus1-generator-install-hook UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook +systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" +systemd.CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-debug-generator/Makefile b/src/systemd-debug-generator/Makefile index bba46c2905..6d087d7f37 100644 --- a/src/systemd-debug-generator/Makefile +++ b/src/systemd-debug-generator/Makefile @@ -31,4 +31,6 @@ systemd_debug_generator_SOURCES = \ systemd_debug_generator_LDADD = \ libshared.la +systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-fstab-generator/mount-setup.c b/src/systemd-fstab-generator/mount-setup.c new file mode 120000 index 0000000000..a4ab487157 --- /dev/null +++ b/src/systemd-fstab-generator/mount-setup.c @@ -0,0 +1 @@ +../libcore/mount-setup.c
\ No newline at end of file diff --git a/src/systemd-fstab-generator/mount-setup.h b/src/systemd-fstab-generator/mount-setup.h new file mode 120000 index 0000000000..1f984851f8 --- /dev/null +++ b/src/systemd-fstab-generator/mount-setup.h @@ -0,0 +1 @@ +../libcore/mount-setup.h
\ No newline at end of file diff --git a/src/systemd-getty-generator/Makefile b/src/systemd-getty-generator/Makefile index 14f7d02a86..cfca8e1e1f 100644 --- a/src/systemd-getty-generator/Makefile +++ b/src/systemd-getty-generator/Makefile @@ -30,4 +30,6 @@ systemd_getty_generator_SOURCES = \ systemd_getty_generator_LDADD = \ libshared.la +systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-gpt-auto-generator/Makefile b/src/systemd-gpt-auto-generator/Makefile index 177db8da7c..070d62ba83 100644 --- a/src/systemd-gpt-auto-generator/Makefile +++ b/src/systemd-gpt-auto-generator/Makefile @@ -40,4 +40,6 @@ systemd_gpt_auto_generator_CFLAGS = \ $(BLKID_CFLAGS) endif # HAVE_BLKID +systemd.CPPFLAGS += -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-hibernate-resume/Makefile b/src/systemd-hibernate-resume/Makefile index baee443e84..4cc9bffdb2 100644 --- a/src/systemd-hibernate-resume/Makefile +++ b/src/systemd-hibernate-resume/Makefile @@ -57,4 +57,6 @@ EXTRA_DIST += \ units/systemd-hibernate-resume@.service.in \ units/systemd-hybrid-sleep.service.in +systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-system-update-generator/Makefile b/src/systemd-system-update-generator/Makefile index fd44aef359..535f072fa8 100644 --- a/src/systemd-system-update-generator/Makefile +++ b/src/systemd-system-update-generator/Makefile @@ -30,4 +30,6 @@ systemd_system_update_generator_SOURCES = \ systemd_system_update_generator_LDADD = \ libshared.la +systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" + include $(topsrcdir)/build-aux/Makefile.tail.mk |