source: patches/systemd-212-compat-1.patch @ 60eb399

clfs-3.0.0-systemdclfs-3.0.0-sysvinitsystemdsysvinit
Last change on this file since 60eb399 was 60eb399, checked in by William Harrington <kb0iic@…>, 10 years ago

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