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

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

Add systemd-211-compat-1.patch to patches.
  • Property mode set to 100644
File size: 9.1 KB

  • Makefile.am 

    Submitted By: William Harrington (kb0iic at cross-lfs dot org)
Date: 2014-03-16
Initial Package Version: 211
Origin: LFS-Systemd
Upstream Status: Rejected
Description: Install pkg-config files when not installing compatible libraries.

diff -Naur a/Makefile.am b/Makefile.am
    a b  
    21722172UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
    21732173
    21742174pkgconfiglib_DATA += \
    2175         src/libsystemd/libsystemd.pc
     2175        src/libsystemd/libsystemd.pc \
     2176        src/compat-libs/libsystemd-journal.pc \
     2177        src/compat-libs/libsystemd-login.pc \
     2178        src/compat-libs/libsystemd-id128.pc \
     2179        src/compat-libs/libsystemd-daemon.pc
    21762180
    21772181pkginclude_HEADERS += \
    21782182        src/systemd/sd-login.h \
    … …  
    45934597        libsystemd-id128.la \
    45944598        libsystemd-daemon.la
    45954599
    4596 pkgconfiglib_DATA += \
    4597         src/compat-libs/libsystemd-journal.pc \
    4598         src/compat-libs/libsystemd-login.pc \
    4599         src/compat-libs/libsystemd-id128.pc \
    4600         src/compat-libs/libsystemd-daemon.pc
    4601 
    46024600# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
    46034601compat-lib-install-hook:
    46044602        libname=libsystemd-login.so && $(move-to-rootlibdir)

  • Makefile.in 

    diff -Naur a/Makefile.in b/Makefile.in
    a b  
    10881088@ENABLE_COMPAT_LIBS_TRUE@       libsystemd-id128.la \
    10891089@ENABLE_COMPAT_LIBS_TRUE@       libsystemd-daemon.la
    10901090
    1091 @ENABLE_COMPAT_LIBS_TRUE@am__append_239 = \
    1092 @ENABLE_COMPAT_LIBS_TRUE@       src/compat-libs/libsystemd-journal.pc \
    1093 @ENABLE_COMPAT_LIBS_TRUE@       src/compat-libs/libsystemd-login.pc \
    1094 @ENABLE_COMPAT_LIBS_TRUE@       src/compat-libs/libsystemd-id128.pc \
    1095 @ENABLE_COMPAT_LIBS_TRUE@       src/compat-libs/libsystemd-daemon.pc
    1096 
    1097 @ENABLE_COMPAT_LIBS_TRUE@am__append_240 = compat-lib-install-hook
    1098 @ENABLE_COMPAT_LIBS_TRUE@am__append_241 = compat-lib-uninstall-hook
    1099 @ENABLE_MANPAGES_TRUE@am__append_242 = \
     1091@ENABLE_COMPAT_LIBS_TRUE@am__append_239 = compat-lib-install-hook
     1092@ENABLE_COMPAT_LIBS_TRUE@am__append_240 = compat-lib-uninstall-hook
     1093@ENABLE_MANPAGES_TRUE@am__append_241 = \
    11001094@ENABLE_MANPAGES_TRUE@  man/custom-entities.ent
    11011095
    1102 @HAVE_SYSV_COMPAT_TRUE@am__append_243 = \
     1096@HAVE_SYSV_COMPAT_TRUE@am__append_242 = \
    11031097@HAVE_SYSV_COMPAT_TRUE@ docs/sysvinit/README \
    11041098@HAVE_SYSV_COMPAT_TRUE@ docs/var-log/README
    11051099
     1100@HAVE_SYSV_COMPAT_TRUE@am__append_243 = \
     1101@HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
     1102
    11061103@HAVE_SYSV_COMPAT_TRUE@am__append_244 = \
    11071104@HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
    11081105
    … …  
    11161113@HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
    11171114
    11181115@HAVE_SYSV_COMPAT_TRUE@am__append_248 = \
    1119 @HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service
    1120 
    1121 @HAVE_SYSV_COMPAT_TRUE@am__append_249 = \
    11221116@HAVE_SYSV_COMPAT_TRUE@ poweroff.target runlevel0.target \
    11231117@HAVE_SYSV_COMPAT_TRUE@ rescue.target runlevel1.target \
    11241118@HAVE_SYSV_COMPAT_TRUE@ multi-user.target runlevel2.target \
    … …  
    11271121@HAVE_SYSV_COMPAT_TRUE@ graphical.target runlevel5.target \
    11281122@HAVE_SYSV_COMPAT_TRUE@ reboot.target runlevel6.target
    11291123
    1130 @HAVE_SYSV_COMPAT_TRUE@am__append_250 = \
     1124@HAVE_SYSV_COMPAT_TRUE@am__append_249 = \
    11311125@HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel1.target.wants \
    11321126@HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel2.target.wants \
    11331127@HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel3.target.wants \
    11341128@HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel4.target.wants \
    11351129@HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel5.target.wants
    11361130
    1137 @HAVE_SYSV_COMPAT_TRUE@am__append_251 = \
     1131@HAVE_SYSV_COMPAT_TRUE@am__append_250 = \
    11381132@HAVE_SYSV_COMPAT_TRUE@ --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
    11391133@HAVE_SYSV_COMPAT_TRUE@ --with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
    11401134
    1141 @HAVE_SYSV_COMPAT_FALSE@am__append_252 = \
     1135@HAVE_SYSV_COMPAT_FALSE@am__append_251 = \
    11421136@HAVE_SYSV_COMPAT_FALSE@        --with-sysvinit-path= \
    11431137@HAVE_SYSV_COMPAT_FALSE@        --with-sysvrcnd-path=
    11441138
    1145 @ENABLE_GTK_DOC_TRUE@am__append_253 = \
     1139@ENABLE_GTK_DOC_TRUE@am__append_252 = \
    11461140@ENABLE_GTK_DOC_TRUE@   --enable-gtk-doc
    11471141
    1148 @ENABLE_COMPAT_LIBS_TRUE@am__append_254 = \
     1142@ENABLE_COMPAT_LIBS_TRUE@am__append_253 = \
    11491143@ENABLE_COMPAT_LIBS_TRUE@       $(test_libsystemd_journal_sym_SOURCES) \
    11501144@ENABLE_COMPAT_LIBS_TRUE@       $(test_libsystemd_login_sym_SOURCES) \
    11511145@ENABLE_COMPAT_LIBS_TRUE@       $(test_libsystemd_id128_sym_SOURCES) \
    11521146@ENABLE_COMPAT_LIBS_TRUE@       $(test_libsystemd_daemon_sym_SOURCES)
    11531147
    1154 @ENABLE_COMPAT_LIBS_TRUE@am__append_255 = \
     1148@ENABLE_COMPAT_LIBS_TRUE@am__append_254 = \
    11551149@ENABLE_COMPAT_LIBS_TRUE@       test-libsystemd-journal-sym \
    11561150@ENABLE_COMPAT_LIBS_TRUE@       test-libsystemd-login-sym \
    11571151@ENABLE_COMPAT_LIBS_TRUE@       test-libsystemd-id128-sym \
    … …  
    41144108        $(am__append_211) $(am__append_234) $(nodist_systemunit_DATA) \
    41154109        $(nodist_userunit_DATA) $(pkgconfigdata_DATA) \
    41164110        $(pkgconfiglib_DATA) $(nodist_polkitpolicy_DATA) \
    4117         $(am__append_243) defined undefined
    4118 DISTCLEANFILES = $(am__append_242)
     4111        $(am__append_242) defined undefined
     4112DISTCLEANFILES = $(am__append_241)
    41194113
    41204114# Really, do not edit this file.
    41214115EXTRA_DIST = units/getty@.service.m4 units/serial-getty@.service.m4 \
    … …  
    43064300        $(nodist_libudev_core_la_SOURCES) $(am__append_99) \
    43074301        $(am__append_235) $(am__append_237) \
    43084302        $(test_libsystemd_sym_SOURCES) $(test_libudev_sym_SOURCES) \
    4309         $(am__append_254)
     4303        $(am__append_253)
    43104304INSTALL_EXEC_HOOKS = install-target-wants-hook \
    43114305        install-directories-hook install-aliases-hook \
    43124306        systemd-detect-virt-install-hook $(am__append_78) \
    43134307        bus-proxyd-install-hook libsystemd-install-hook \
    43144308        libudev-install-hook $(am__append_101) journal-install-hook \
    4315         $(am__append_240)
     4309        $(am__append_239)
    43164310UNINSTALL_EXEC_HOOKS = $(am__append_79) bus-proxyd-uninstall-hook \
    43174311        libsystemd-uninstall-hook libudev-uninstall-hook \
    4318         $(am__append_102) journal-uninstall-hook $(am__append_241)
     4312        $(am__append_102) journal-uninstall-hook $(am__append_240)
    43194313INSTALL_DATA_HOOKS = units-install-hook hwdb-update-hook \
    43204314        catalog-update-hook
    43214315UNINSTALL_DATA_HOOKS = units-uninstall-hook catalog-remove-hook
    … …  
    43534347include_HEADERS = src/libudev/libudev.h
    43544348noinst_DATA = $(am__append_49) $(am__append_51) $(am__append_86)
    43554349pkgconfiglib_DATA = src/libsystemd/libsystemd.pc \
    4356         src/libudev/libudev.pc $(am__append_97) $(am__append_239)
     4350        src/compat-libs/libsystemd-journal.pc \
     4351        src/compat-libs/libsystemd-login.pc \
     4352        src/compat-libs/libsystemd-id128.pc \
     4353        src/compat-libs/libsystemd-daemon.pc src/libudev/libudev.pc \
     4354        $(am__append_97)
    43574355polkitpolicy_in_in_files =  \
    43584356        src/core/org.freedesktop.systemd1.policy.in.in
    43594357polkitpolicy_in_files =  \
    … …  
    44064404        test-journal-verify test-journal-interleaving \
    44074405        test-journal-flush test-mmap-cache test-catalog \
    44084406        $(am__append_196) $(am__append_209) $(am__append_220) \
    4409         test-libsystemd-sym test-libudev-sym $(am__append_255)
     4407        test-libsystemd-sym test-libudev-sym $(am__append_254)
    44104408
    44114409# ------------------------------------------------------------------------------
    44124410manual_tests = test-engine test-ns test-loopback test-hostname \
    … …  
    44694467# ------------------------------------------------------------------------------
    44704468INSTALL_DIRS = $(am__append_71) $(sysconfdir)/udev/rules.d \
    44714469        $(sysconfdir)/udev/hwdb.d $(am__append_125) $(am__append_185) \
    4472         $(am__append_227) $(am__append_250) \
     4470        $(am__append_227) $(am__append_249) \
    44734471        $(prefix)/lib/modules-load.d $(sysconfdir)/modules-load.d \
    44744472        $(prefix)/lib/systemd/network $(sysconfdir)/systemd/network \
    44754473        $(prefix)/lib/sysctl.d $(sysconfdir)/sysctl.d \
    … …  
    44804478        $(pkgsysconfdir)/system/getty.target.wants \
    44814479        $(pkgsysconfdir)/user $(dbussessionservicedir) \
    44824480        $(sysconfdir)/xdg/systemd
    4483 RUNLEVEL1_TARGET_WANTS = $(am__append_244)
    4484 RUNLEVEL2_TARGET_WANTS = $(am__append_245)
    4485 RUNLEVEL3_TARGET_WANTS = $(am__append_246)
    4486 RUNLEVEL4_TARGET_WANTS = $(am__append_247)
    4487 RUNLEVEL5_TARGET_WANTS = $(am__append_248)
     4481RUNLEVEL1_TARGET_WANTS = $(am__append_243)
     4482RUNLEVEL2_TARGET_WANTS = $(am__append_244)
     4483RUNLEVEL3_TARGET_WANTS = $(am__append_245)
     4484RUNLEVEL4_TARGET_WANTS = $(am__append_246)
     4485RUNLEVEL5_TARGET_WANTS = $(am__append_247)
    44884486SHUTDOWN_TARGET_WANTS =
    44894487LOCAL_FS_TARGET_WANTS = systemd-remount-fs.service tmp.mount
    44904488MULTI_USER_TARGET_WANTS = $(am__append_228) getty.target \
    … …  
    45094507USER_BUSNAMES_TARGET_WANTS = $(am__append_165)
    45104508SYSTEM_UNIT_ALIASES = $(am__append_155) $(am__append_173) \
    45114509        $(am__append_186) $(am__append_202) $(am__append_229) \
    4512         $(am__append_249) graphical.target default.target \
     4510        $(am__append_248) graphical.target default.target \
    45134511        reboot.target ctrl-alt-del.target getty@.service \
    45144512        autovt@.service
    45154513USER_UNIT_ALIASES = $(am__append_166) $(systemunitdir)/shutdown.target \
    … …  
    72707268        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
    72717269        --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
    72727270        --with-rootprefix=$$dc_install_base --disable-split-usr \
    7273         --enable-kdbus --enable-compat-libs $(am__append_251) \
    7274         $(am__append_252) $(am__append_253)
     7271        --enable-kdbus --enable-compat-libs $(am__append_250) \
     7272        $(am__append_251) $(am__append_252)
    72757273www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
    72767274OBJECT_VARIABLES := $(filter %_OBJECTS,$(.VARIABLES))
    72777275ALL_OBJECTS := $(foreach v,$(OBJECT_VARIABLES),$($(v)))
Note: See TracBrowser for help on using the repository browser.