source: patches/systemd-213-compat-1.patch@ 061a372

clfs-3.0.0-systemd systemd
Last change on this file since 061a372 was ca55789, checked in by William Harrington <kb0iic@…>, 10 years ago

Update systemd patch for 213 upgrade.
  • Property mode set to 100644
File size: 7.7 KB
RevLine 
[ca55789]1Submitted By: William Harrington (kb0iic at cross-lfs dot org)
2Date: 2014-05-28
3Initial Package Version: 213
4Origin: LFS-Systemd
5Upstream Status: Rejected
6Description: Install pkg-config files when not installing compatible libraries.
7
8--- a/Makefile.am 2014-05-28 03:42:22.808237166 +0200
9+++ b/Makefile.am 2014-05-28 14:01:53.375293715 +0200
10@@ -2226,7 +2226,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@@ -4813,12 +4817,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-05-28 14:02:52.993403259 +0200
37+++ b/Makefile.in 2014-05-28 14:02:36.079090682 +0200
38@@ -1164,21 +1164,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_254 = \
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_255 = compat-lib-install-hook
49-@ENABLE_COMPAT_LIBS_TRUE@am__append_256 = compat-lib-uninstall-hook
50-@ENABLE_MANPAGES_TRUE@am__append_257 = \
51+@ENABLE_COMPAT_LIBS_TRUE@am__append_254 = compat-lib-install-hook
52+@ENABLE_COMPAT_LIBS_TRUE@am__append_255 = compat-lib-uninstall-hook
53+@ENABLE_MANPAGES_TRUE@am__append_256 = \
54 @ENABLE_MANPAGES_TRUE@ man/custom-entities.ent
55
56-@HAVE_SYSV_COMPAT_TRUE@am__append_258 = \
57+@HAVE_SYSV_COMPAT_TRUE@am__append_257 = \
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_258 = \
62+@HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
63+
64 @HAVE_SYSV_COMPAT_TRUE@am__append_259 = \
65 @HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
66
67@@ -1192,9 +1189,6 @@
68 @HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
69
70 @HAVE_SYSV_COMPAT_TRUE@am__append_263 = \
71-@HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
72-
73-@HAVE_SYSV_COMPAT_TRUE@am__append_264 = \
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@@ -1203,22 +1197,22 @@
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_265 = \
82+@HAVE_SYSV_COMPAT_TRUE@am__append_264 = \
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_266 = \
90+@HAVE_SYSV_COMPAT_TRUE@am__append_265 = \
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_267 = \
95+@HAVE_SYSV_COMPAT_FALSE@am__append_266 = \
96 @HAVE_SYSV_COMPAT_FALSE@ --with-sysvinit-path= \
97 @HAVE_SYSV_COMPAT_FALSE@ --with-sysvrcnd-path=
98
99-@ENABLE_GTK_DOC_TRUE@am__append_268 = \
100+@ENABLE_GTK_DOC_TRUE@am__append_267 = \
101 @ENABLE_GTK_DOC_TRUE@ --enable-gtk-doc
102
103 subdir = .
104@@ -4285,8 +4279,8 @@
105 $(am__append_249) $(nodist_systemunit_DATA) \
106 $(nodist_userunit_DATA) $(pkgconfigdata_DATA) \
107 $(pkgconfiglib_DATA) $(nodist_polkitpolicy_DATA) \
108- $(am__append_258) defined undefined
109-DISTCLEANFILES = $(am__append_257)
110+ $(am__append_257) defined undefined
111+DISTCLEANFILES = $(am__append_256)
112
113 # Really, do not edit this file.
114 EXTRA_DIST = units/getty@.service.m4 units/serial-getty@.service.m4 \
115@@ -4486,10 +4480,10 @@
116 systemd-detect-virt-install-hook $(am__append_83) \
117 bus-proxyd-install-hook libsystemd-install-hook \
118 libudev-install-hook $(am__append_106) journal-install-hook \
119- $(am__append_255)
120+ $(am__append_254)
121 UNINSTALL_EXEC_HOOKS = $(am__append_84) bus-proxyd-uninstall-hook \
122 libsystemd-uninstall-hook libudev-uninstall-hook \
123- $(am__append_107) journal-uninstall-hook $(am__append_256)
124+ $(am__append_107) journal-uninstall-hook $(am__append_255)
125 INSTALL_DATA_HOOKS = units-install-hook hwdb-update-hook \
126 catalog-update-hook
127 UNINSTALL_DATA_HOOKS = units-uninstall-hook catalog-remove-hook
128@@ -4528,7 +4522,11 @@
129 include_HEADERS = src/libudev/libudev.h
130 noinst_DATA = $(am__append_53) $(am__append_55) $(am__append_91)
131 pkgconfiglib_DATA = src/libsystemd/libsystemd.pc \
132- src/libudev/libudev.pc $(am__append_102) $(am__append_254)
133+ src/compat-libs/libsystemd-journal.pc \
134+ src/compat-libs/libsystemd-login.pc \
135+ src/compat-libs/libsystemd-id128.pc \
136+ src/compat-libs/libsystemd-daemon.pc src/libudev/libudev.pc \
137+ $(am__append_102)
138 polkitpolicy_in_in_files = \
139 src/core/org.freedesktop.systemd1.policy.in.in
140 polkitpolicy_in_files = \
141@@ -4649,7 +4647,7 @@
142 # ------------------------------------------------------------------------------
143 INSTALL_DIRS = $(am__append_76) $(sysconfdir)/udev/rules.d \
144 $(sysconfdir)/udev/hwdb.d $(am__append_133) $(am__append_189) \
145- $(am__append_242) $(am__append_265) \
146+ $(am__append_242) $(am__append_264) \
147 $(prefix)/lib/modules-load.d $(sysconfdir)/modules-load.d \
148 $(prefix)/lib/systemd/network $(sysconfdir)/systemd/network \
149 $(prefix)/lib/sysctl.d $(sysconfdir)/sysctl.d \
150@@ -4660,11 +4658,11 @@
151 $(pkgsysconfdir)/system/getty.target.wants \
152 $(pkgsysconfdir)/user $(dbussessionservicedir) \
153 $(sysconfdir)/xdg/systemd
154-RUNLEVEL1_TARGET_WANTS = $(am__append_259)
155-RUNLEVEL2_TARGET_WANTS = $(am__append_260)
156-RUNLEVEL3_TARGET_WANTS = $(am__append_261)
157-RUNLEVEL4_TARGET_WANTS = $(am__append_262)
158-RUNLEVEL5_TARGET_WANTS = $(am__append_263)
159+RUNLEVEL1_TARGET_WANTS = $(am__append_258)
160+RUNLEVEL2_TARGET_WANTS = $(am__append_259)
161+RUNLEVEL3_TARGET_WANTS = $(am__append_260)
162+RUNLEVEL4_TARGET_WANTS = $(am__append_261)
163+RUNLEVEL5_TARGET_WANTS = $(am__append_262)
164 SHUTDOWN_TARGET_WANTS =
165 LOCAL_FS_TARGET_WANTS = systemd-remount-fs.service tmp.mount
166 MULTI_USER_TARGET_WANTS = $(am__append_243) getty.target \
167@@ -4689,7 +4687,7 @@
168 USER_BUSNAMES_TARGET_WANTS =
169 SYSTEM_UNIT_ALIASES = $(am__append_164) $(am__append_177) \
170 $(am__append_190) $(am__append_211) $(am__append_244) \
171- $(am__append_264) graphical.target default.target \
172+ $(am__append_263) graphical.target default.target \
173 reboot.target ctrl-alt-del.target getty@.service \
174 autovt@.service
175 USER_UNIT_ALIASES = $(systemunitdir)/shutdown.target shutdown.target \
176@@ -7602,8 +7600,8 @@
177 --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
178 --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
179 --with-rootprefix=$$dc_install_base --disable-split-usr \
180- --enable-kdbus --enable-compat-libs $(am__append_266) \
181- $(am__append_267) $(am__append_268)
182+ --enable-kdbus --enable-compat-libs $(am__append_265) \
183+ $(am__append_266) $(am__append_267)
184 www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
185 OBJECT_VARIABLES := $(filter %_OBJECTS,$(.VARIABLES))
186 ALL_OBJECTS := $(foreach v,$(OBJECT_VARIABLES),$($(v)))
Note: See TracBrowser for help on using the repository browser.