|
|
771b4bc |
From 78370bfe8ed645524186dbf658eae8d5a5d54a47 Mon Sep 17 00:00:00 2001
|
|
|
771b4bc |
From: Kay Sievers <kay@vrfy.org>
|
|
|
771b4bc |
Date: Thu, 12 Apr 2012 13:34:18 +0200
|
|
|
771b4bc |
Subject: [PATCH] move more main systemd parts to core/ (cherry picked from
|
|
|
771b4bc |
commit 90ccc3fca7e53a60a9e67b9d5812e1d4a27fc07d)
|
|
|
771b4bc |
|
|
|
771b4bc |
Conflicts:
|
|
|
771b4bc |
|
|
|
771b4bc |
Makefile.am
|
|
|
771b4bc |
---
|
|
|
771b4bc |
Makefile.am | 123 +++++++++++---------
|
|
|
771b4bc |
po/POTFILES.skip | 2 +-
|
|
|
771b4bc |
src/{ => core}/load-fragment-gperf.gperf.m4 | 0
|
|
|
771b4bc |
src/{ => core}/org.freedesktop.systemd1.conf | 0
|
|
|
771b4bc |
.../org.freedesktop.systemd1.policy.in.in | 0
|
|
|
771b4bc |
src/{ => core}/org.freedesktop.systemd1.service | 0
|
|
|
771b4bc |
src/{ => core}/system.conf | 0
|
|
|
771b4bc |
src/{ => core}/systemd.pc.in | 0
|
|
|
771b4bc |
src/{ => core}/user.conf | 0
|
|
|
771b4bc |
9 files changed, 66 insertions(+), 59 deletions(-)
|
|
|
771b4bc |
rename src/{ => core}/load-fragment-gperf.gperf.m4 (100%)
|
|
|
771b4bc |
rename src/{ => core}/org.freedesktop.systemd1.conf (100%)
|
|
|
771b4bc |
rename src/{ => core}/org.freedesktop.systemd1.policy.in.in (100%)
|
|
|
771b4bc |
rename src/{ => core}/org.freedesktop.systemd1.service (100%)
|
|
|
771b4bc |
rename src/{ => core}/system.conf (100%)
|
|
|
771b4bc |
rename src/{ => core}/systemd.pc.in (100%)
|
|
|
771b4bc |
rename src/{ => core}/user.conf (100%)
|
|
|
771b4bc |
|
|
|
771b4bc |
diff --git a/Makefile.am b/Makefile.am
|
|
|
771b4bc |
index 8114524..c9c643d 100644
|
|
|
771b4bc |
--- a/Makefile.am
|
|
|
771b4bc |
+++ b/Makefile.am
|
|
|
771b4bc |
@@ -77,6 +77,10 @@ lib_LTLIBRARIES =
|
|
|
771b4bc |
pkgconfiglib_DATA =
|
|
|
771b4bc |
polkitpolicy_in_files =
|
|
|
771b4bc |
dist_udevrules_DATA =
|
|
|
771b4bc |
+dist_pkgsysconf_DATA =
|
|
|
771b4bc |
+dist_dbuspolicy_DATA =
|
|
|
771b4bc |
+dbusinterface_DATA =
|
|
|
771b4bc |
+dist_dbussystemservice_DATA =
|
|
|
771b4bc |
|
|
|
771b4bc |
AM_CPPFLAGS = \
|
|
|
771b4bc |
-include $(top_builddir)/config.h \
|
|
|
771b4bc |
@@ -224,34 +228,9 @@ noinst_PROGRAMS = \
|
|
|
771b4bc |
test-install \
|
|
|
771b4bc |
test-watchdog
|
|
|
771b4bc |
|
|
|
771b4bc |
-dist_pkgsysconf_DATA = \
|
|
|
771b4bc |
- src/system.conf \
|
|
|
771b4bc |
- src/user.conf
|
|
|
771b4bc |
-
|
|
|
771b4bc |
-dist_dbuspolicy_DATA = \
|
|
|
771b4bc |
- src/org.freedesktop.systemd1.conf
|
|
|
771b4bc |
-
|
|
|
771b4bc |
-dist_dbussystemservice_DATA = \
|
|
|
771b4bc |
- src/org.freedesktop.systemd1.service
|
|
|
771b4bc |
-
|
|
|
771b4bc |
nodist_udevrules_DATA = \
|
|
|
771b4bc |
src/99-systemd.rules
|
|
|
771b4bc |
|
|
|
771b4bc |
-dbusinterface_DATA = \
|
|
|
771b4bc |
- org.freedesktop.systemd1.Manager.xml \
|
|
|
771b4bc |
- org.freedesktop.systemd1.Job.xml \
|
|
|
771b4bc |
- org.freedesktop.systemd1.Unit.xml \
|
|
|
771b4bc |
- org.freedesktop.systemd1.Service.xml \
|
|
|
771b4bc |
- org.freedesktop.systemd1.Socket.xml \
|
|
|
771b4bc |
- org.freedesktop.systemd1.Timer.xml \
|
|
|
771b4bc |
- org.freedesktop.systemd1.Target.xml \
|
|
|
771b4bc |
- org.freedesktop.systemd1.Device.xml \
|
|
|
771b4bc |
- org.freedesktop.systemd1.Mount.xml \
|
|
|
771b4bc |
- org.freedesktop.systemd1.Automount.xml \
|
|
|
771b4bc |
- org.freedesktop.systemd1.Snapshot.xml \
|
|
|
771b4bc |
- org.freedesktop.systemd1.Swap.xml \
|
|
|
771b4bc |
- org.freedesktop.systemd1.Path.xml
|
|
|
771b4bc |
-
|
|
|
771b4bc |
dist_bashcompletion_DATA = \
|
|
|
771b4bc |
src/systemd-bash-completion.sh
|
|
|
771b4bc |
|
|
|
771b4bc |
@@ -372,7 +351,6 @@ EXTRA_DIST += \
|
|
|
771b4bc |
units/fsck@.service.in \
|
|
|
771b4bc |
units/fsck-root.service.in \
|
|
|
771b4bc |
units/user@.service.in \
|
|
|
771b4bc |
- src/systemd.pc.in \
|
|
|
771b4bc |
introspect.awk \
|
|
|
771b4bc |
src/99-systemd.rules.in \
|
|
|
771b4bc |
man/custom-html.xsl
|
|
|
771b4bc |
@@ -442,21 +420,6 @@ dist_doc_DATA = \
|
|
|
771b4bc |
LICENSE \
|
|
|
771b4bc |
DISTRO_PORTING
|
|
|
771b4bc |
|
|
|
771b4bc |
-pkgconfigdata_DATA = \
|
|
|
771b4bc |
- src/systemd.pc
|
|
|
771b4bc |
-
|
|
|
771b4bc |
-# First passed through sed, followed by intltool
|
|
|
771b4bc |
-polkitpolicy_in_in_files = \
|
|
|
771b4bc |
- src/org.freedesktop.systemd1.policy.in.in
|
|
|
771b4bc |
-
|
|
|
771b4bc |
-nodist_polkitpolicy_DATA = \
|
|
|
771b4bc |
- $(polkitpolicy_in_files:.policy.in=.policy) \
|
|
|
771b4bc |
- $(polkitpolicy_in_in_files:.policy.in.in=.policy)
|
|
|
771b4bc |
-
|
|
|
771b4bc |
-EXTRA_DIST += \
|
|
|
771b4bc |
- $(polkitpolicy_in_files) \
|
|
|
771b4bc |
- $(polkitpolicy_in_in_files)
|
|
|
771b4bc |
-
|
|
|
771b4bc |
@INTLTOOL_POLICY_RULE@
|
|
|
771b4bc |
|
|
|
771b4bc |
# ------------------------------------------------------------------------------
|
|
|
771b4bc |
@@ -770,11 +733,8 @@ libsystemd_core_la_SOURCES = \
|
|
|
771b4bc |
src/core/sysfs-show.h
|
|
|
771b4bc |
|
|
|
771b4bc |
nodist_libsystemd_core_la_SOURCES = \
|
|
|
771b4bc |
- src/load-fragment-gperf.c \
|
|
|
771b4bc |
- src/load-fragment-gperf-nulstr.c
|
|
|
771b4bc |
-
|
|
|
771b4bc |
-EXTRA_DIST += \
|
|
|
771b4bc |
- src/load-fragment-gperf.gperf.m4
|
|
|
771b4bc |
+ src/core/load-fragment-gperf.c \
|
|
|
771b4bc |
+ src/core/load-fragment-gperf-nulstr.c
|
|
|
771b4bc |
|
|
|
771b4bc |
libsystemd_core_la_CFLAGS = \
|
|
|
771b4bc |
$(AM_CFLAGS) \
|
|
|
771b4bc |
@@ -797,6 +757,18 @@ libsystemd_core_la_LIBADD = \
|
|
|
771b4bc |
$(CAP_LIBS) \
|
|
|
771b4bc |
$(KMOD_LIBS)
|
|
|
771b4bc |
|
|
|
771b4bc |
+src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
|
|
|
771b4bc |
+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
|
|
|
771b4bc |
+ $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+EXTRA_DIST += \
|
|
|
771b4bc |
+ src/core/load-fragment-gperf.gperf.m4
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+CLEANFILES += \
|
|
|
771b4bc |
+ src/core/load-fragment-gperf.gperf \
|
|
|
771b4bc |
+ src/core/load-fragment-gperf.c \
|
|
|
771b4bc |
+ src/core/load-fragment-gperf-nulstr.c
|
|
|
771b4bc |
+
|
|
|
771b4bc |
# ------------------------------------------------------------------------------
|
|
|
771b4bc |
systemd_SOURCES = \
|
|
|
771b4bc |
src/core/main.c
|
|
|
771b4bc |
@@ -811,6 +783,45 @@ systemd_LDADD = \
|
|
|
771b4bc |
libsystemd-daemon.la \
|
|
|
771b4bc |
libsystemd-id128.la
|
|
|
771b4bc |
|
|
|
771b4bc |
+dist_pkgsysconf_DATA += \
|
|
|
771b4bc |
+ src/core/system.conf \
|
|
|
771b4bc |
+ src/core/user.conf
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+dist_dbuspolicy_DATA += \
|
|
|
771b4bc |
+ src/core/org.freedesktop.systemd1.conf
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+dist_dbussystemservice_DATA += \
|
|
|
771b4bc |
+ src/core/org.freedesktop.systemd1.service
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+dbusinterface_DATA += \
|
|
|
771b4bc |
+ org.freedesktop.systemd1.Manager.xml \
|
|
|
771b4bc |
+ org.freedesktop.systemd1.Job.xml \
|
|
|
771b4bc |
+ org.freedesktop.systemd1.Unit.xml \
|
|
|
771b4bc |
+ org.freedesktop.systemd1.Service.xml \
|
|
|
771b4bc |
+ org.freedesktop.systemd1.Socket.xml \
|
|
|
771b4bc |
+ org.freedesktop.systemd1.Timer.xml \
|
|
|
771b4bc |
+ org.freedesktop.systemd1.Target.xml \
|
|
|
771b4bc |
+ org.freedesktop.systemd1.Device.xml \
|
|
|
771b4bc |
+ org.freedesktop.systemd1.Mount.xml \
|
|
|
771b4bc |
+ org.freedesktop.systemd1.Automount.xml \
|
|
|
771b4bc |
+ org.freedesktop.systemd1.Snapshot.xml \
|
|
|
771b4bc |
+ org.freedesktop.systemd1.Swap.xml \
|
|
|
771b4bc |
+ org.freedesktop.systemd1.Path.xml
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+polkitpolicy_in_in_files = \
|
|
|
771b4bc |
+ src/core/org.freedesktop.systemd1.policy.in.in
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+org.freedesktop.systemd1.%.xml: systemd
|
|
|
771b4bc |
+ $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
|
|
|
771b4bc |
+ $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
|
|
|
771b4bc |
+ $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+pkgconfigdata_DATA = \
|
|
|
771b4bc |
+ src/core/systemd.pc
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+EXTRA_DIST += \
|
|
|
771b4bc |
+ src/core/systemd.pc.in
|
|
|
771b4bc |
+
|
|
|
771b4bc |
# ------------------------------------------------------------------------------
|
|
|
771b4bc |
test_engine_SOURCES = \
|
|
|
771b4bc |
src/test/test-engine.c
|
|
|
771b4bc |
@@ -2278,10 +2289,6 @@ src/%: src/%.m4
|
|
|
771b4bc |
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
|
|
|
771b4bc |
$(M4) -P $(M4_DEFINES) < $< > $@ || rm $@
|
|
|
771b4bc |
|
|
|
771b4bc |
-src/load-fragment-gperf-nulstr.c: src/load-fragment-gperf.gperf
|
|
|
771b4bc |
- $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
|
|
|
771b4bc |
- $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
|
|
|
771b4bc |
-
|
|
|
771b4bc |
M4_PROCESS_SYSTEM = \
|
|
|
771b4bc |
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
|
|
|
771b4bc |
$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@
|
|
|
771b4bc |
@@ -2296,6 +2303,14 @@ units/%: units/%.m4 Makefile
|
|
|
771b4bc |
units/user/%: units/%.m4 Makefile
|
|
|
771b4bc |
$(M4_PROCESS_USER)
|
|
|
771b4bc |
|
|
|
771b4bc |
+nodist_polkitpolicy_DATA = \
|
|
|
771b4bc |
+ $(polkitpolicy_in_files:.policy.in=.policy) \
|
|
|
771b4bc |
+ $(polkitpolicy_in_in_files:.policy.in.in=.policy)
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+EXTRA_DIST += \
|
|
|
771b4bc |
+ $(polkitpolicy_in_files) \
|
|
|
771b4bc |
+ $(polkitpolicy_in_in_files)
|
|
|
771b4bc |
+
|
|
|
771b4bc |
CLEANFILES += \
|
|
|
771b4bc |
$(nodist_systemunit_DATA) \
|
|
|
771b4bc |
$(nodist_userunit_DATA) \
|
|
|
771b4bc |
@@ -2303,9 +2318,6 @@ CLEANFILES += \
|
|
|
771b4bc |
$(pkgconfigdata_DATA) \
|
|
|
771b4bc |
$(pkgconfiglib_DATA) \
|
|
|
771b4bc |
$(nodist_polkitpolicy_DATA) \
|
|
|
771b4bc |
- src/load-fragment-gperf.gperf \
|
|
|
771b4bc |
- src/load-fragment-gperf.c \
|
|
|
771b4bc |
- src/load-fragment-gperf-nulstr.c \
|
|
|
771b4bc |
src/99-systemd.rules
|
|
|
771b4bc |
|
|
|
771b4bc |
if HAVE_VALAC
|
|
|
771b4bc |
@@ -2351,11 +2363,6 @@ endif
|
|
|
771b4bc |
|
|
|
771b4bc |
DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
|
|
|
771b4bc |
|
|
|
771b4bc |
-org.freedesktop.systemd1.%.xml: systemd
|
|
|
771b4bc |
- $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
|
|
|
771b4bc |
- $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
|
|
|
771b4bc |
- $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
|
|
|
771b4bc |
-
|
|
|
771b4bc |
CLEANFILES += \
|
|
|
771b4bc |
$(dbusinterface_DATA)
|
|
|
771b4bc |
|
|
|
771b4bc |
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
|
|
|
771b4bc |
index 2acacbb..5dc4a51 100644
|
|
|
771b4bc |
--- a/po/POTFILES.skip
|
|
|
771b4bc |
+++ b/po/POTFILES.skip
|
|
|
771b4bc |
@@ -13,7 +13,7 @@ src/core/dbus-timer.c
|
|
|
771b4bc |
src/core/dbus-unit.c
|
|
|
771b4bc |
src/hostname/hostnamed.c
|
|
|
771b4bc |
src/locale/localed.c
|
|
|
771b4bc |
-src/org.freedesktop.systemd1.policy.in.in
|
|
|
771b4bc |
+src/core/org.freedesktop.systemd1.policy.in.in
|
|
|
771b4bc |
src/timedate/timedated.c
|
|
|
771b4bc |
units/systemd-readahead-done.service.in
|
|
|
771b4bc |
units/user@.service.in
|
|
|
771b4bc |
diff --git a/src/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
|
|
|
771b4bc |
similarity index 100%
|
|
|
771b4bc |
rename from src/load-fragment-gperf.gperf.m4
|
|
|
771b4bc |
rename to src/core/load-fragment-gperf.gperf.m4
|
|
|
771b4bc |
diff --git a/src/org.freedesktop.systemd1.conf b/src/core/org.freedesktop.systemd1.conf
|
|
|
771b4bc |
similarity index 100%
|
|
|
771b4bc |
rename from src/org.freedesktop.systemd1.conf
|
|
|
771b4bc |
rename to src/core/org.freedesktop.systemd1.conf
|
|
|
771b4bc |
diff --git a/src/org.freedesktop.systemd1.policy.in.in b/src/core/org.freedesktop.systemd1.policy.in.in
|
|
|
771b4bc |
similarity index 100%
|
|
|
771b4bc |
rename from src/org.freedesktop.systemd1.policy.in.in
|
|
|
771b4bc |
rename to src/core/org.freedesktop.systemd1.policy.in.in
|
|
|
771b4bc |
diff --git a/src/org.freedesktop.systemd1.service b/src/core/org.freedesktop.systemd1.service
|
|
|
771b4bc |
similarity index 100%
|
|
|
771b4bc |
rename from src/org.freedesktop.systemd1.service
|
|
|
771b4bc |
rename to src/core/org.freedesktop.systemd1.service
|
|
|
771b4bc |
diff --git a/src/system.conf b/src/core/system.conf
|
|
|
771b4bc |
similarity index 100%
|
|
|
771b4bc |
rename from src/system.conf
|
|
|
771b4bc |
rename to src/core/system.conf
|
|
|
771b4bc |
diff --git a/src/systemd.pc.in b/src/core/systemd.pc.in
|
|
|
771b4bc |
similarity index 100%
|
|
|
771b4bc |
rename from src/systemd.pc.in
|
|
|
771b4bc |
rename to src/core/systemd.pc.in
|
|
|
771b4bc |
diff --git a/src/user.conf b/src/core/user.conf
|
|
|
771b4bc |
similarity index 100%
|
|
|
771b4bc |
rename from src/user.conf
|
|
|
771b4bc |
rename to src/core/user.conf
|