Ticket #1003: systemd-226-compat-1.patch
File systemd-226-compat-1.patch, 8.3 KB (added by , 9 years ago) |
---|
-
Makefile.am
a b 3016 3016 UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook 3017 3017 3018 3018 pkgconfiglib_DATA += \ 3019 src/libsystemd/libsystemd.pc 3019 src/libsystemd/libsystemd.pc \ 3020 src/compat-libs/libsystemd-journal.pc \ 3021 src/compat-libs/libsystemd-login.pc \ 3022 src/compat-libs/libsystemd-id128.pc \ 3023 src/compat-libs/libsystemd-daemon.pc 3020 3024 3021 3025 pkginclude_HEADERS += \ 3022 3026 src/systemd/sd-bus.h \ … … 5663 5667 libsystemd-id128.la \ 5664 5668 libsystemd-daemon.la 5665 5669 5666 pkgconfiglib_DATA += \5667 src/compat-libs/libsystemd-journal.pc \5668 src/compat-libs/libsystemd-login.pc \5669 src/compat-libs/libsystemd-id128.pc \5670 src/compat-libs/libsystemd-daemon.pc5671 5672 5670 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed 5673 5671 compat-lib-install-hook: 5674 5672 libname=libsystemd-login.so && $(move-to-rootlibdir) -
Makefile.in
a b 1220 1220 @ENABLE_COMPAT_LIBS_TRUE@ libsystemd-id128.la \ 1221 1221 @ENABLE_COMPAT_LIBS_TRUE@ libsystemd-daemon.la 1222 1222 1223 @ENABLE_COMPAT_LIBS_TRUE@am__append_299 = \ 1224 @ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-journal.pc \ 1225 @ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-login.pc \ 1226 @ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-id128.pc \ 1227 @ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-daemon.pc 1228 1229 @ENABLE_COMPAT_LIBS_TRUE@am__append_300 = compat-lib-install-hook 1230 @ENABLE_COMPAT_LIBS_TRUE@am__append_301 = compat-lib-uninstall-hook 1231 @ENABLE_MANPAGES_TRUE@am__append_302 = \ 1223 @ENABLE_COMPAT_LIBS_TRUE@am__append_299 = compat-lib-install-hook 1224 @ENABLE_COMPAT_LIBS_TRUE@am__append_300 = compat-lib-uninstall-hook 1225 @ENABLE_MANPAGES_TRUE@am__append_301 = \ 1232 1226 @ENABLE_MANPAGES_TRUE@ man/custom-entities.ent 1233 1227 1234 @HAVE_SYSV_COMPAT_TRUE@am__append_30 3= \1228 @HAVE_SYSV_COMPAT_TRUE@am__append_302 = \ 1235 1229 @HAVE_SYSV_COMPAT_TRUE@ docs/sysvinit/README \ 1236 1230 @HAVE_SYSV_COMPAT_TRUE@ docs/var-log/README 1237 1231 1238 @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_30 4= \1232 @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_303 = \ 1239 1233 @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@ systemd-update-utmp-runlevel.service 1240 1234 1241 @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_30 5= \1235 @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_304 = \ 1242 1236 @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@ systemd-update-utmp-runlevel.service 1243 1237 1244 @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_30 6= \1238 @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_305 = \ 1245 1239 @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@ systemd-update-utmp-runlevel.service 1246 1240 1247 @HAVE_UTMP_TRUE@am__append_30 7= \1241 @HAVE_UTMP_TRUE@am__append_306 = \ 1248 1242 @HAVE_UTMP_TRUE@ systemd-update-utmp.service 1249 1243 1250 @HAVE_SYSV_COMPAT_TRUE@am__append_30 8= \1244 @HAVE_SYSV_COMPAT_TRUE@am__append_307 = \ 1251 1245 @HAVE_SYSV_COMPAT_TRUE@ poweroff.target runlevel0.target \ 1252 1246 @HAVE_SYSV_COMPAT_TRUE@ rescue.target runlevel1.target \ 1253 1247 @HAVE_SYSV_COMPAT_TRUE@ multi-user.target runlevel2.target \ … … 1256 1250 @HAVE_SYSV_COMPAT_TRUE@ graphical.target runlevel5.target \ 1257 1251 @HAVE_SYSV_COMPAT_TRUE@ reboot.target runlevel6.target 1258 1252 1259 @HAVE_SYSV_COMPAT_TRUE@am__append_30 9= \1253 @HAVE_SYSV_COMPAT_TRUE@am__append_308 = \ 1260 1254 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel1.target.wants \ 1261 1255 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel2.target.wants \ 1262 1256 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel3.target.wants \ 1263 1257 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel4.target.wants \ 1264 1258 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel5.target.wants 1265 1259 1266 @HAVE_SYSV_COMPAT_TRUE@am__append_3 10= \1260 @HAVE_SYSV_COMPAT_TRUE@am__append_309 = \ 1267 1261 @HAVE_SYSV_COMPAT_TRUE@ --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \ 1268 1262 @HAVE_SYSV_COMPAT_TRUE@ --with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir) 1269 1263 1270 @HAVE_SYSV_COMPAT_FALSE@am__append_31 1= \1264 @HAVE_SYSV_COMPAT_FALSE@am__append_310 = \ 1271 1265 @HAVE_SYSV_COMPAT_FALSE@ --with-sysvinit-path= \ 1272 1266 @HAVE_SYSV_COMPAT_FALSE@ --with-sysvrcnd-path= 1273 1267 1274 @ENABLE_SPLIT_USR_TRUE@am__append_31 2= \1268 @ENABLE_SPLIT_USR_TRUE@am__append_311 = \ 1275 1269 @ENABLE_SPLIT_USR_TRUE@ --enable-split-usr 1276 1270 1277 @ENABLE_SPLIT_USR_FALSE@am__append_31 3= \1271 @ENABLE_SPLIT_USR_FALSE@am__append_312 = \ 1278 1272 @ENABLE_SPLIT_USR_FALSE@ --disable-split-usr 1279 1273 1280 1274 subdir = . … … 4950 4944 install-touch-usr-hook install-busnames-target-wants-hook \ 4951 4945 systemd-detect-virt-install-hook dbus1-generator-install-hook \ 4952 4946 $(am__append_109) libsystemd-install-hook libudev-install-hook \ 4953 $(am__append_126) journal-install-hook $(am__append_ 300)4947 $(am__append_126) journal-install-hook $(am__append_299) 4954 4948 UNINSTALL_EXEC_HOOKS = dbus1-generator-uninstall-hook \ 4955 4949 libsystemd-uninstall-hook libudev-uninstall-hook \ 4956 journal-uninstall-hook $(am__append_30 1)4950 journal-uninstall-hook $(am__append_300) 4957 4951 INSTALL_DATA_HOOKS = units-install-hook $(am__append_117) \ 4958 4952 catalog-update-hook 4959 4953 UNINSTALL_DATA_HOOKS = units-uninstall-hook catalog-remove-hook … … 4990 4984 noinst_DATA = $(am__append_61) $(am__append_63) 4991 4985 pkgconfigdata_DATA = src/core/systemd.pc src/udev/udev.pc 4992 4986 pkgconfiglib_DATA = src/libsystemd/libsystemd.pc \ 4993 src/libudev/libudev.pc $(am__append_299) 4987 src/compat-libs/libsystemd-journal.pc \ 4988 src/compat-libs/libsystemd-login.pc \ 4989 src/compat-libs/libsystemd-id128.pc \ 4990 src/compat-libs/libsystemd-daemon.pc src/libudev/libudev.pc 4994 4991 polkitpolicy_in_in_files = \ 4995 4992 src/core/org.freedesktop.systemd1.policy.in.in 4996 4993 polkitpolicy_in_files = \ … … 5091 5088 $(nodist_zshcompletion_DATA) $(am__append_62) $(am__append_64) \ 5092 5089 $(gperf_txt_sources:-list.txt=-from-name.gperf) \ 5093 5090 $(gperf_txt_sources) $(am__append_106) $(am__append_154) \ 5094 $(am__append_30 2) $(am__append_303) defined undefined \5091 $(am__append_301) $(am__append_302) defined undefined \ 5095 5092 test-libsystemd-sym.c test-libudev-sym.c 5096 5093 AM_CPPFLAGS = \ 5097 5094 -include $(top_builddir)/config.h \ … … 5169 5166 # ------------------------------------------------------------------------------ 5170 5167 INSTALL_DIRS = $(am__append_88) $(am__append_92) \ 5171 5168 $(sysconfdir)/udev/rules.d $(am__append_114) $(am__append_158) \ 5172 $(am__append_288) $(am__append_30 9) \5169 $(am__append_288) $(am__append_308) \ 5173 5170 $(prefix)/lib/modules-load.d $(sysconfdir)/modules-load.d \ 5174 5171 $(prefix)/lib/systemd/network $(sysconfdir)/systemd/network \ 5175 5172 $(prefix)/lib/sysctl.d $(sysconfdir)/sysctl.d \ … … 5184 5181 LOCAL_FS_TARGET_WANTS = systemd-remount-fs.service tmp.mount \ 5185 5182 var-lib-machines.mount 5186 5183 MULTI_USER_TARGET_WANTS = $(am__append_289) $(am__append_296) \ 5187 $(am__append_30 4) getty.target systemd-ask-password-wall.path5188 GRAPHICAL_TARGET_WANTS = $(am__append_30 5)5189 RESCUE_TARGET_WANTS = $(am__append_30 6)5184 $(am__append_303) getty.target systemd-ask-password-wall.path 5185 GRAPHICAL_TARGET_WANTS = $(am__append_304) 5186 RESCUE_TARGET_WANTS = $(am__append_305) 5190 5187 SYSINIT_TARGET_WANTS = $(am__append_71) $(am__append_78) \ 5191 5188 $(am__append_80) $(am__append_85) $(am__append_91) \ 5192 5189 $(am__append_95) systemd-machine-id-commit.service \ … … 5195 5192 systemd-journal-flush.service \ 5196 5193 systemd-journal-catalog-update.service $(am__append_159) \ 5197 5194 $(am__append_163) $(am__append_171) $(am__append_179) \ 5198 $(am__append_30 7) systemd-update-done.service \5195 $(am__append_306) systemd-update-done.service \ 5199 5196 dev-hugepages.mount dev-mqueue.mount sys-kernel-config.mount \ 5200 5197 sys-kernel-debug.mount sys-fs-fuse-connections.mount \ 5201 5198 systemd-sysctl.service systemd-ask-password-console.path … … 5214 5211 SYSTEM_UNIT_ALIASES = $(am__append_186) $(am__append_197) \ 5215 5212 $(am__append_208) $(am__append_232) $(am__append_239) \ 5216 5213 $(am__append_251) $(am__append_270) $(am__append_290) \ 5217 $(am__append_30 8) graphical.target default.target \5214 $(am__append_307) graphical.target default.target \ 5218 5215 reboot.target ctrl-alt-del.target getty@.service \ 5219 5216 autovt@.service 5220 5217 USER_UNIT_ALIASES = $(systemunitdir)/shutdown.target shutdown.target \ … … 8777 8774 --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ 8778 8775 --with-pamconfdir=$$dc_install_base/$(pamconfdir) \ 8779 8776 --with-rootprefix=$$dc_install_base --enable-compat-libs \ 8780 $(am__append_3 10) $(am__append_311) $(am__append_312) \8781 $(am__append_31 3)8777 $(am__append_309) $(am__append_310) $(am__append_311) \ 8778 $(am__append_312) 8782 8779 www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd 8783 8780 OBJECT_VARIABLES := $(filter %_OBJECTS,$(.VARIABLES)) 8784 8781 ALL_OBJECTS := $(foreach v,$(OBJECT_VARIABLES),$($(v)))