Ticket #1003: systemd-226-compat-1.patch

File systemd-226-compat-1.patch, 8.3 KB (added by William Harrington, 9 years ago)

Compat patch for Systemd 226

  • Makefile.am

    a b  
    30163016UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
    30173017
    30183018pkgconfiglib_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
    30203024
    30213025pkginclude_HEADERS += \
    30223026        src/systemd/sd-bus.h \
     
    56635667        libsystemd-id128.la \
    56645668        libsystemd-daemon.la
    56655669
    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.pc
    5671 
    56725670# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
    56735671compat-lib-install-hook:
    56745672        libname=libsystemd-login.so && $(move-to-rootlibdir)
  • Makefile.in

    a b  
    12201220@ENABLE_COMPAT_LIBS_TRUE@       libsystemd-id128.la \
    12211221@ENABLE_COMPAT_LIBS_TRUE@       libsystemd-daemon.la
    12221222
    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 = \
    12321226@ENABLE_MANPAGES_TRUE@  man/custom-entities.ent
    12331227
    1234 @HAVE_SYSV_COMPAT_TRUE@am__append_303 = \
     1228@HAVE_SYSV_COMPAT_TRUE@am__append_302 = \
    12351229@HAVE_SYSV_COMPAT_TRUE@ docs/sysvinit/README \
    12361230@HAVE_SYSV_COMPAT_TRUE@ docs/var-log/README
    12371231
    1238 @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_304 = \
     1232@HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_303 = \
    12391233@HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@ systemd-update-utmp-runlevel.service
    12401234
    1241 @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_305 = \
     1235@HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_304 = \
    12421236@HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@ systemd-update-utmp-runlevel.service
    12431237
    1244 @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_306 = \
     1238@HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_305 = \
    12451239@HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@ systemd-update-utmp-runlevel.service
    12461240
    1247 @HAVE_UTMP_TRUE@am__append_307 = \
     1241@HAVE_UTMP_TRUE@am__append_306 = \
    12481242@HAVE_UTMP_TRUE@        systemd-update-utmp.service
    12491243
    1250 @HAVE_SYSV_COMPAT_TRUE@am__append_308 = \
     1244@HAVE_SYSV_COMPAT_TRUE@am__append_307 = \
    12511245@HAVE_SYSV_COMPAT_TRUE@ poweroff.target runlevel0.target \
    12521246@HAVE_SYSV_COMPAT_TRUE@ rescue.target runlevel1.target \
    12531247@HAVE_SYSV_COMPAT_TRUE@ multi-user.target runlevel2.target \
     
    12561250@HAVE_SYSV_COMPAT_TRUE@ graphical.target runlevel5.target \
    12571251@HAVE_SYSV_COMPAT_TRUE@ reboot.target runlevel6.target
    12581252
    1259 @HAVE_SYSV_COMPAT_TRUE@am__append_309 = \
     1253@HAVE_SYSV_COMPAT_TRUE@am__append_308 = \
    12601254@HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel1.target.wants \
    12611255@HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel2.target.wants \
    12621256@HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel3.target.wants \
    12631257@HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel4.target.wants \
    12641258@HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel5.target.wants
    12651259
    1266 @HAVE_SYSV_COMPAT_TRUE@am__append_310 = \
     1260@HAVE_SYSV_COMPAT_TRUE@am__append_309 = \
    12671261@HAVE_SYSV_COMPAT_TRUE@ --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
    12681262@HAVE_SYSV_COMPAT_TRUE@ --with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
    12691263
    1270 @HAVE_SYSV_COMPAT_FALSE@am__append_311 = \
     1264@HAVE_SYSV_COMPAT_FALSE@am__append_310 = \
    12711265@HAVE_SYSV_COMPAT_FALSE@        --with-sysvinit-path= \
    12721266@HAVE_SYSV_COMPAT_FALSE@        --with-sysvrcnd-path=
    12731267
    1274 @ENABLE_SPLIT_USR_TRUE@am__append_312 = \
     1268@ENABLE_SPLIT_USR_TRUE@am__append_311 = \
    12751269@ENABLE_SPLIT_USR_TRUE@ --enable-split-usr
    12761270
    1277 @ENABLE_SPLIT_USR_FALSE@am__append_313 = \
     1271@ENABLE_SPLIT_USR_FALSE@am__append_312 = \
    12781272@ENABLE_SPLIT_USR_FALSE@        --disable-split-usr
    12791273
    12801274subdir = .
     
    49504944        install-touch-usr-hook install-busnames-target-wants-hook \
    49514945        systemd-detect-virt-install-hook dbus1-generator-install-hook \
    49524946        $(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)
    49544948UNINSTALL_EXEC_HOOKS = dbus1-generator-uninstall-hook \
    49554949        libsystemd-uninstall-hook libudev-uninstall-hook \
    4956         journal-uninstall-hook $(am__append_301)
     4950        journal-uninstall-hook $(am__append_300)
    49574951INSTALL_DATA_HOOKS = units-install-hook $(am__append_117) \
    49584952        catalog-update-hook
    49594953UNINSTALL_DATA_HOOKS = units-uninstall-hook catalog-remove-hook
     
    49904984noinst_DATA = $(am__append_61) $(am__append_63)
    49914985pkgconfigdata_DATA = src/core/systemd.pc src/udev/udev.pc
    49924986pkgconfiglib_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
    49944991polkitpolicy_in_in_files =  \
    49954992        src/core/org.freedesktop.systemd1.policy.in.in
    49964993polkitpolicy_in_files =  \
     
    50915088        $(nodist_zshcompletion_DATA) $(am__append_62) $(am__append_64) \
    50925089        $(gperf_txt_sources:-list.txt=-from-name.gperf) \
    50935090        $(gperf_txt_sources) $(am__append_106) $(am__append_154) \
    5094         $(am__append_302) $(am__append_303) defined undefined \
     5091        $(am__append_301) $(am__append_302) defined undefined \
    50955092        test-libsystemd-sym.c test-libudev-sym.c
    50965093AM_CPPFLAGS = \
    50975094        -include $(top_builddir)/config.h \
     
    51695166# ------------------------------------------------------------------------------
    51705167INSTALL_DIRS = $(am__append_88) $(am__append_92) \
    51715168        $(sysconfdir)/udev/rules.d $(am__append_114) $(am__append_158) \
    5172         $(am__append_288) $(am__append_309) \
     5169        $(am__append_288) $(am__append_308) \
    51735170        $(prefix)/lib/modules-load.d $(sysconfdir)/modules-load.d \
    51745171        $(prefix)/lib/systemd/network $(sysconfdir)/systemd/network \
    51755172        $(prefix)/lib/sysctl.d $(sysconfdir)/sysctl.d \
     
    51845181LOCAL_FS_TARGET_WANTS = systemd-remount-fs.service tmp.mount \
    51855182        var-lib-machines.mount
    51865183MULTI_USER_TARGET_WANTS = $(am__append_289) $(am__append_296) \
    5187         $(am__append_304) getty.target systemd-ask-password-wall.path
    5188 GRAPHICAL_TARGET_WANTS = $(am__append_305)
    5189 RESCUE_TARGET_WANTS = $(am__append_306)
     5184        $(am__append_303) getty.target systemd-ask-password-wall.path
     5185GRAPHICAL_TARGET_WANTS = $(am__append_304)
     5186RESCUE_TARGET_WANTS = $(am__append_305)
    51905187SYSINIT_TARGET_WANTS = $(am__append_71) $(am__append_78) \
    51915188        $(am__append_80) $(am__append_85) $(am__append_91) \
    51925189        $(am__append_95) systemd-machine-id-commit.service \
     
    51955192        systemd-journal-flush.service \
    51965193        systemd-journal-catalog-update.service $(am__append_159) \
    51975194        $(am__append_163) $(am__append_171) $(am__append_179) \
    5198         $(am__append_307) systemd-update-done.service \
     5195        $(am__append_306) systemd-update-done.service \
    51995196        dev-hugepages.mount dev-mqueue.mount sys-kernel-config.mount \
    52005197        sys-kernel-debug.mount sys-fs-fuse-connections.mount \
    52015198        systemd-sysctl.service systemd-ask-password-console.path
     
    52145211SYSTEM_UNIT_ALIASES = $(am__append_186) $(am__append_197) \
    52155212        $(am__append_208) $(am__append_232) $(am__append_239) \
    52165213        $(am__append_251) $(am__append_270) $(am__append_290) \
    5217         $(am__append_308) graphical.target default.target \
     5214        $(am__append_307) graphical.target default.target \
    52185215        reboot.target ctrl-alt-del.target getty@.service \
    52195216        autovt@.service
    52205217USER_UNIT_ALIASES = $(systemunitdir)/shutdown.target shutdown.target \
     
    87778774        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
    87788775        --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
    87798776        --with-rootprefix=$$dc_install_base --enable-compat-libs \
    8780         $(am__append_310) $(am__append_311) $(am__append_312) \
    8781         $(am__append_313)
     8777        $(am__append_309) $(am__append_310) $(am__append_311) \
     8778        $(am__append_312)
    87828779www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
    87838780OBJECT_VARIABLES := $(filter %_OBJECTS,$(.VARIABLES))
    87848781ALL_OBJECTS := $(foreach v,$(OBJECT_VARIABLES),$($(v)))