source: patches/systemd-211-compat-1.patch@ 496c645

clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 496c645 was dd3bdd5, checked in by William Harrington <kb0iic@…>, 11 years ago

Add systemd-211-compat-1.patch to patches.
  • Property mode set to 100644
File size: 9.1 KB
RevLine 
[dd3bdd5]1Submitted By: William Harrington (kb0iic at cross-lfs dot org)
2Date: 2014-03-16
3Initial Package Version: 211
4Origin: LFS-Systemd
5Upstream Status: Rejected
6Description: Install pkg-config files when not installing compatible libraries.
7
8diff -Naur a/Makefile.am b/Makefile.am
9--- a/Makefile.am 2014-03-11 23:59:13.901273469 +0100
10+++ b/Makefile.am 2014-03-12 14:51:23.377895312 +0100
11@@ -2172,7 +2172,11 @@
12 UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
13
14 pkgconfiglib_DATA += \
15- src/libsystemd/libsystemd.pc
16+ src/libsystemd/libsystemd.pc \
17+ src/compat-libs/libsystemd-journal.pc \
18+ src/compat-libs/libsystemd-login.pc \
19+ src/compat-libs/libsystemd-id128.pc \
20+ src/compat-libs/libsystemd-daemon.pc
21
22 pkginclude_HEADERS += \
23 src/systemd/sd-login.h \
24@@ -4593,12 +4597,6 @@
25 libsystemd-id128.la \
26 libsystemd-daemon.la
27
28-pkgconfiglib_DATA += \
29- src/compat-libs/libsystemd-journal.pc \
30- src/compat-libs/libsystemd-login.pc \
31- src/compat-libs/libsystemd-id128.pc \
32- src/compat-libs/libsystemd-daemon.pc
33-
34 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
35 compat-lib-install-hook:
36 libname=libsystemd-login.so && $(move-to-rootlibdir)
37diff -Naur a/Makefile.in b/Makefile.in
38--- a/Makefile.in 2014-03-12 00:00:32.183093655 +0100
39+++ b/Makefile.in 2014-03-12 14:51:23.380895364 +0100
40@@ -1088,21 +1088,18 @@
41 @ENABLE_COMPAT_LIBS_TRUE@ libsystemd-id128.la \
42 @ENABLE_COMPAT_LIBS_TRUE@ libsystemd-daemon.la
43
44-@ENABLE_COMPAT_LIBS_TRUE@am__append_239 = \
45-@ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-journal.pc \
46-@ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-login.pc \
47-@ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-id128.pc \
48-@ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-daemon.pc
49-
50-@ENABLE_COMPAT_LIBS_TRUE@am__append_240 = compat-lib-install-hook
51-@ENABLE_COMPAT_LIBS_TRUE@am__append_241 = compat-lib-uninstall-hook
52-@ENABLE_MANPAGES_TRUE@am__append_242 = \
53+@ENABLE_COMPAT_LIBS_TRUE@am__append_239 = compat-lib-install-hook
54+@ENABLE_COMPAT_LIBS_TRUE@am__append_240 = compat-lib-uninstall-hook
55+@ENABLE_MANPAGES_TRUE@am__append_241 = \
56 @ENABLE_MANPAGES_TRUE@ man/custom-entities.ent
57
58-@HAVE_SYSV_COMPAT_TRUE@am__append_243 = \
59+@HAVE_SYSV_COMPAT_TRUE@am__append_242 = \
60 @HAVE_SYSV_COMPAT_TRUE@ docs/sysvinit/README \
61 @HAVE_SYSV_COMPAT_TRUE@ docs/var-log/README
62
63+@HAVE_SYSV_COMPAT_TRUE@am__append_243 = \
64+@HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
65+
66 @HAVE_SYSV_COMPAT_TRUE@am__append_244 = \
67 @HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
68
69@@ -1116,9 +1113,6 @@
70 @HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
71
72 @HAVE_SYSV_COMPAT_TRUE@am__append_248 = \
73-@HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
74-
75-@HAVE_SYSV_COMPAT_TRUE@am__append_249 = \
76 @HAVE_SYSV_COMPAT_TRUE@ poweroff.target runlevel0.target \
77 @HAVE_SYSV_COMPAT_TRUE@ rescue.target runlevel1.target \
78 @HAVE_SYSV_COMPAT_TRUE@ multi-user.target runlevel2.target \
79@@ -1127,31 +1121,31 @@
80 @HAVE_SYSV_COMPAT_TRUE@ graphical.target runlevel5.target \
81 @HAVE_SYSV_COMPAT_TRUE@ reboot.target runlevel6.target
82
83-@HAVE_SYSV_COMPAT_TRUE@am__append_250 = \
84+@HAVE_SYSV_COMPAT_TRUE@am__append_249 = \
85 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel1.target.wants \
86 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel2.target.wants \
87 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel3.target.wants \
88 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel4.target.wants \
89 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel5.target.wants
90
91-@HAVE_SYSV_COMPAT_TRUE@am__append_251 = \
92+@HAVE_SYSV_COMPAT_TRUE@am__append_250 = \
93 @HAVE_SYSV_COMPAT_TRUE@ --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
94 @HAVE_SYSV_COMPAT_TRUE@ --with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
95
96-@HAVE_SYSV_COMPAT_FALSE@am__append_252 = \
97+@HAVE_SYSV_COMPAT_FALSE@am__append_251 = \
98 @HAVE_SYSV_COMPAT_FALSE@ --with-sysvinit-path= \
99 @HAVE_SYSV_COMPAT_FALSE@ --with-sysvrcnd-path=
100
101-@ENABLE_GTK_DOC_TRUE@am__append_253 = \
102+@ENABLE_GTK_DOC_TRUE@am__append_252 = \
103 @ENABLE_GTK_DOC_TRUE@ --enable-gtk-doc
104
105-@ENABLE_COMPAT_LIBS_TRUE@am__append_254 = \
106+@ENABLE_COMPAT_LIBS_TRUE@am__append_253 = \
107 @ENABLE_COMPAT_LIBS_TRUE@ $(test_libsystemd_journal_sym_SOURCES) \
108 @ENABLE_COMPAT_LIBS_TRUE@ $(test_libsystemd_login_sym_SOURCES) \
109 @ENABLE_COMPAT_LIBS_TRUE@ $(test_libsystemd_id128_sym_SOURCES) \
110 @ENABLE_COMPAT_LIBS_TRUE@ $(test_libsystemd_daemon_sym_SOURCES)
111
112-@ENABLE_COMPAT_LIBS_TRUE@am__append_255 = \
113+@ENABLE_COMPAT_LIBS_TRUE@am__append_254 = \
114 @ENABLE_COMPAT_LIBS_TRUE@ test-libsystemd-journal-sym \
115 @ENABLE_COMPAT_LIBS_TRUE@ test-libsystemd-login-sym \
116 @ENABLE_COMPAT_LIBS_TRUE@ test-libsystemd-id128-sym \
117@@ -4114,8 +4108,8 @@
118 $(am__append_211) $(am__append_234) $(nodist_systemunit_DATA) \
119 $(nodist_userunit_DATA) $(pkgconfigdata_DATA) \
120 $(pkgconfiglib_DATA) $(nodist_polkitpolicy_DATA) \
121- $(am__append_243) defined undefined
122-DISTCLEANFILES = $(am__append_242)
123+ $(am__append_242) defined undefined
124+DISTCLEANFILES = $(am__append_241)
125
126 # Really, do not edit this file.
127 EXTRA_DIST = units/getty@.service.m4 units/serial-getty@.service.m4 \
128@@ -4306,16 +4300,16 @@
129 $(nodist_libudev_core_la_SOURCES) $(am__append_99) \
130 $(am__append_235) $(am__append_237) \
131 $(test_libsystemd_sym_SOURCES) $(test_libudev_sym_SOURCES) \
132- $(am__append_254)
133+ $(am__append_253)
134 INSTALL_EXEC_HOOKS = install-target-wants-hook \
135 install-directories-hook install-aliases-hook \
136 systemd-detect-virt-install-hook $(am__append_78) \
137 bus-proxyd-install-hook libsystemd-install-hook \
138 libudev-install-hook $(am__append_101) journal-install-hook \
139- $(am__append_240)
140+ $(am__append_239)
141 UNINSTALL_EXEC_HOOKS = $(am__append_79) bus-proxyd-uninstall-hook \
142 libsystemd-uninstall-hook libudev-uninstall-hook \
143- $(am__append_102) journal-uninstall-hook $(am__append_241)
144+ $(am__append_102) journal-uninstall-hook $(am__append_240)
145 INSTALL_DATA_HOOKS = units-install-hook hwdb-update-hook \
146 catalog-update-hook
147 UNINSTALL_DATA_HOOKS = units-uninstall-hook catalog-remove-hook
148@@ -4353,7 +4347,11 @@
149 include_HEADERS = src/libudev/libudev.h
150 noinst_DATA = $(am__append_49) $(am__append_51) $(am__append_86)
151 pkgconfiglib_DATA = src/libsystemd/libsystemd.pc \
152- src/libudev/libudev.pc $(am__append_97) $(am__append_239)
153+ src/compat-libs/libsystemd-journal.pc \
154+ src/compat-libs/libsystemd-login.pc \
155+ src/compat-libs/libsystemd-id128.pc \
156+ src/compat-libs/libsystemd-daemon.pc src/libudev/libudev.pc \
157+ $(am__append_97)
158 polkitpolicy_in_in_files = \
159 src/core/org.freedesktop.systemd1.policy.in.in
160 polkitpolicy_in_files = \
161@@ -4406,7 +4404,7 @@
162 test-journal-verify test-journal-interleaving \
163 test-journal-flush test-mmap-cache test-catalog \
164 $(am__append_196) $(am__append_209) $(am__append_220) \
165- test-libsystemd-sym test-libudev-sym $(am__append_255)
166+ test-libsystemd-sym test-libudev-sym $(am__append_254)
167
168 # ------------------------------------------------------------------------------
169 manual_tests = test-engine test-ns test-loopback test-hostname \
170@@ -4469,7 +4467,7 @@
171 # ------------------------------------------------------------------------------
172 INSTALL_DIRS = $(am__append_71) $(sysconfdir)/udev/rules.d \
173 $(sysconfdir)/udev/hwdb.d $(am__append_125) $(am__append_185) \
174- $(am__append_227) $(am__append_250) \
175+ $(am__append_227) $(am__append_249) \
176 $(prefix)/lib/modules-load.d $(sysconfdir)/modules-load.d \
177 $(prefix)/lib/systemd/network $(sysconfdir)/systemd/network \
178 $(prefix)/lib/sysctl.d $(sysconfdir)/sysctl.d \
179@@ -4480,11 +4478,11 @@
180 $(pkgsysconfdir)/system/getty.target.wants \
181 $(pkgsysconfdir)/user $(dbussessionservicedir) \
182 $(sysconfdir)/xdg/systemd
183-RUNLEVEL1_TARGET_WANTS = $(am__append_244)
184-RUNLEVEL2_TARGET_WANTS = $(am__append_245)
185-RUNLEVEL3_TARGET_WANTS = $(am__append_246)
186-RUNLEVEL4_TARGET_WANTS = $(am__append_247)
187-RUNLEVEL5_TARGET_WANTS = $(am__append_248)
188+RUNLEVEL1_TARGET_WANTS = $(am__append_243)
189+RUNLEVEL2_TARGET_WANTS = $(am__append_244)
190+RUNLEVEL3_TARGET_WANTS = $(am__append_245)
191+RUNLEVEL4_TARGET_WANTS = $(am__append_246)
192+RUNLEVEL5_TARGET_WANTS = $(am__append_247)
193 SHUTDOWN_TARGET_WANTS =
194 LOCAL_FS_TARGET_WANTS = systemd-remount-fs.service tmp.mount
195 MULTI_USER_TARGET_WANTS = $(am__append_228) getty.target \
196@@ -4509,7 +4507,7 @@
197 USER_BUSNAMES_TARGET_WANTS = $(am__append_165)
198 SYSTEM_UNIT_ALIASES = $(am__append_155) $(am__append_173) \
199 $(am__append_186) $(am__append_202) $(am__append_229) \
200- $(am__append_249) graphical.target default.target \
201+ $(am__append_248) graphical.target default.target \
202 reboot.target ctrl-alt-del.target getty@.service \
203 autovt@.service
204 USER_UNIT_ALIASES = $(am__append_166) $(systemunitdir)/shutdown.target \
205@@ -7270,8 +7268,8 @@
206 --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
207 --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
208 --with-rootprefix=$$dc_install_base --disable-split-usr \
209- --enable-kdbus --enable-compat-libs $(am__append_251) \
210- $(am__append_252) $(am__append_253)
211+ --enable-kdbus --enable-compat-libs $(am__append_250) \
212+ $(am__append_251) $(am__append_252)
213 www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
214 OBJECT_VARIABLES := $(filter %_OBJECTS,$(.VARIABLES))
215 ALL_OBJECTS := $(foreach v,$(OBJECT_VARIABLES),$($(v)))
Note: See TracBrowser for help on using the repository browser.