Author: dj Date: Sat Feb 13 00:15:06 2016 New Revision: 3354 Log: Add systemd-229-compat-1.patch, remove broken systemd-228-drop_RA patch.
Added: trunk/systemd/systemd-229-compat-1.patch Deleted: trunk/systemd/systemd-228-drop_RA_on_non_link_local-1.patch Added: trunk/systemd/systemd-229-compat-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/systemd/systemd-229-compat-1.patch Sat Feb 13 00:15:06 2016 (r3354) @@ -0,0 +1,198 @@ +Submitted By: DJ Lucas +Date: 2016-02-13 +Initial Package Version: 229 +Upstream Status: Not applicable +Origin: Previous systemd compat patch by Douglas R. Reno +Description: Make it install compat pkg-config files without + building compat-libs which are useless on LFS. + +diff -Naurp systemd-229-orig/Makefile.am systemd-229/Makefile.am +--- systemd-229-orig/Makefile.am 2016-02-11 19:17:18.509776677 -0600 ++++ systemd-229/Makefile.am 2016-02-12 18:36:34.928665571 -0600 +@@ -3166,7 +3166,11 @@ INSTALL_EXEC_HOOKS += libsystemd-install + UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook + + pkgconfiglib_DATA += \ +- src/libsystemd/libsystemd.pc ++ src/libsystemd/libsystemd.pc \ ++ src/compat-libs/libsystemd-journal.pc \ ++ src/compat-libs/libsystemd-login.pc \ ++ src/compat-libs/libsystemd-id128.pc \ ++ src/compat-libs/libsystemd-daemon.pc + + pkginclude_HEADERS += \ + src/systemd/sd-bus.h \ +@@ -5873,12 +5877,6 @@ lib_LTLIBRARIES += \ + libsystemd-id128.la \ + libsystemd-daemon.la + +-pkgconfiglib_DATA += \ +- src/compat-libs/libsystemd-journal.pc \ +- src/compat-libs/libsystemd-login.pc \ +- src/compat-libs/libsystemd-id128.pc \ +- src/compat-libs/libsystemd-daemon.pc +- + # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed + compat-lib-install-hook: + libname=libsystemd-login.so && $(move-to-rootlibdir) +diff -Naurp systemd-229-orig/Makefile.in systemd-229/Makefile.in +--- systemd-229-orig/Makefile.in 2016-02-11 19:18:55.658477936 -0600 ++++ systemd-229/Makefile.in 2016-02-12 18:43:56.206680658 -0600 +@@ -1219,36 +1219,30 @@ systemgenerator_PROGRAMS = systemd-getty + @ENABLE_COMPAT_LIBS_TRUE@ libsystemd-daemon.c + + @ENABLE_COMPAT_LIBS_TRUE@am__append_299 = \ +-@ENABLE_COMPAT_LIBS_TRUE@ libsystemd-journal.la \ +-@ENABLE_COMPAT_LIBS_TRUE@ libsystemd-login.la \ +-@ENABLE_COMPAT_LIBS_TRUE@ libsystemd-id128.la \ +-@ENABLE_COMPAT_LIBS_TRUE@ libsystemd-daemon.la +- +-@ENABLE_COMPAT_LIBS_TRUE@am__append_300 = \ + @ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-journal.pc \ + @ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-login.pc \ + @ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-id128.pc \ + @ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-daemon.pc + +-@ENABLE_COMPAT_LIBS_TRUE@am__append_301 = compat-lib-install-hook +-@ENABLE_COMPAT_LIBS_TRUE@am__append_302 = compat-lib-uninstall-hook +-@HAVE_SYSV_COMPAT_TRUE@am__append_303 = \ ++@ENABLE_COMPAT_LIBS_TRUE@am__append_300 = compat-lib-install-hook ++@ENABLE_COMPAT_LIBS_TRUE@am__append_301 = compat-lib-uninstall-hook ++@HAVE_SYSV_COMPAT_TRUE@am__append_302 = \ + @HAVE_SYSV_COMPAT_TRUE@ docs/sysvinit/README \ + @HAVE_SYSV_COMPAT_TRUE@ docs/var-log/README + +-@HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_304 = \ ++@HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_303 = \ + @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@ systemd-update-utmp-runlevel.service + +-@HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_305 = \ ++@HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_304 = \ + @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@ systemd-update-utmp-runlevel.service + +-@HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_306 = \ ++@HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@am__append_305 = \ + @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@ systemd-update-utmp-runlevel.service + +-@HAVE_UTMP_TRUE@am__append_307 = \ ++@HAVE_UTMP_TRUE@am__append_306 = \ + @HAVE_UTMP_TRUE@ systemd-update-utmp.service + +-@HAVE_SYSV_COMPAT_TRUE@am__append_308 = \ ++@HAVE_SYSV_COMPAT_TRUE@am__append_307 = \ + @HAVE_SYSV_COMPAT_TRUE@ poweroff.target runlevel0.target \ + @HAVE_SYSV_COMPAT_TRUE@ rescue.target runlevel1.target \ + @HAVE_SYSV_COMPAT_TRUE@ multi-user.target runlevel2.target \ +@@ -1257,25 +1251,25 @@ systemgenerator_PROGRAMS = systemd-getty + @HAVE_SYSV_COMPAT_TRUE@ graphical.target runlevel5.target \ + @HAVE_SYSV_COMPAT_TRUE@ reboot.target runlevel6.target + +-@HAVE_SYSV_COMPAT_TRUE@am__append_309 = \ ++@HAVE_SYSV_COMPAT_TRUE@am__append_308 = \ + @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel1.target.wants \ + @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel2.target.wants \ + @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel3.target.wants \ + @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel4.target.wants \ + @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel5.target.wants + +-@HAVE_SYSV_COMPAT_TRUE@am__append_310 = \ ++@HAVE_SYSV_COMPAT_TRUE@am__append_309 = \ + @HAVE_SYSV_COMPAT_TRUE@ --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \ + @HAVE_SYSV_COMPAT_TRUE@ --with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir) + +-@HAVE_SYSV_COMPAT_FALSE@am__append_311 = \ ++@HAVE_SYSV_COMPAT_FALSE@am__append_310 = \ + @HAVE_SYSV_COMPAT_FALSE@ --with-sysvinit-path= \ + @HAVE_SYSV_COMPAT_FALSE@ --with-sysvrcnd-path= + +-@ENABLE_SPLIT_USR_TRUE@am__append_312 = \ ++@ENABLE_SPLIT_USR_TRUE@am__append_311 = \ + @ENABLE_SPLIT_USR_TRUE@ --enable-split-usr + +-@ENABLE_SPLIT_USR_FALSE@am__append_313 = \ ++@ENABLE_SPLIT_USR_FALSE@am__append_312 = \ + @ENABLE_SPLIT_USR_FALSE@ --disable-split-usr + + subdir = . +@@ -5148,10 +5142,10 @@ INSTALL_EXEC_HOOKS = install-target-want + install-touch-usr-hook install-busnames-target-wants-hook \ + systemd-detect-virt-install-hook dbus1-generator-install-hook \ + $(am__append_107) libsystemd-install-hook libudev-install-hook \ +- $(am__append_124) journal-install-hook $(am__append_301) ++ $(am__append_124) journal-install-hook $(am__append_300) + UNINSTALL_EXEC_HOOKS = dbus1-generator-uninstall-hook \ + libsystemd-uninstall-hook libudev-uninstall-hook \ +- journal-uninstall-hook $(am__append_302) ++ journal-uninstall-hook $(am__append_301) + INSTALL_DATA_HOOKS = units-install-hook $(am__append_115) \ + catalog-update-hook + UNINSTALL_DATA_HOOKS = units-uninstall-hook catalog-remove-hook +@@ -5188,7 +5182,7 @@ include_HEADERS = src/libudev/libudev.h + noinst_DATA = $(am__append_61) $(am__append_62) + pkgconfigdata_DATA = src/core/systemd.pc src/udev/udev.pc + pkgconfiglib_DATA = src/libsystemd/libsystemd.pc \ +- src/libudev/libudev.pc $(am__append_300) ++ src/libudev/libudev.pc $(am__append_299) + polkitpolicy_in_in_files = \ + src/core/org.freedesktop.systemd1.policy.in.in + polkitpolicy_in_files = \ +@@ -5307,7 +5301,7 @@ CLEANFILES = $(BUILT_SOURCES) $(pkgconfi + $(gperf_txt_sources) $(systemd_boot_objects) \ + $(systemd_boot_solib) $(systemd_boot) $(stub_objects) \ + $(stub_solib) $(stub) test-efi-disk.img $(am__append_155) \ +- man/custom-entities.ent $(am__append_303) defined undefined \ ++ man/custom-entities.ent $(am__append_302) defined undefined \ + test-libsystemd-sym.c test-libudev-sym.c + AM_CPPFLAGS = \ + -include $(top_builddir)/config.h \ +@@ -5385,7 +5379,7 @@ AM_LDFLAGS = $(OUR_LDFLAGS) + # ------------------------------------------------------------------------------ + INSTALL_DIRS = $(am__append_86) $(am__append_91) \ + $(sysconfdir)/udev/rules.d $(am__append_112) $(am__append_159) \ +- $(am__append_289) $(am__append_309) \ ++ $(am__append_289) $(am__append_308) \ + $(prefix)/lib/modules-load.d $(sysconfdir)/modules-load.d \ + $(prefix)/lib/systemd/network $(sysconfdir)/systemd/network \ + $(prefix)/lib/sysctl.d $(sysconfdir)/sysctl.d \ +@@ -5400,9 +5394,9 @@ SHUTDOWN_TARGET_WANTS = + LOCAL_FS_TARGET_WANTS = systemd-remount-fs.service tmp.mount \ + var-lib-machines.mount + MULTI_USER_TARGET_WANTS = $(am__append_290) $(am__append_297) \ +- $(am__append_304) getty.target systemd-ask-password-wall.path +-GRAPHICAL_TARGET_WANTS = $(am__append_305) +-RESCUE_TARGET_WANTS = $(am__append_306) ++ $(am__append_303) getty.target systemd-ask-password-wall.path ++GRAPHICAL_TARGET_WANTS = $(am__append_304) ++RESCUE_TARGET_WANTS = $(am__append_305) + SYSINIT_TARGET_WANTS = $(am__append_68) $(am__append_76) \ + $(am__append_78) $(am__append_83) $(am__append_89) \ + $(am__append_94) systemd-machine-id-commit.service \ +@@ -5411,7 +5405,7 @@ SYSINIT_TARGET_WANTS = $(am__append_68) + systemd-journal-flush.service \ + systemd-journal-catalog-update.service $(am__append_160) \ + $(am__append_164) $(am__append_172) $(am__append_181) \ +- $(am__append_307) systemd-update-done.service \ ++ $(am__append_306) systemd-update-done.service \ + dev-hugepages.mount dev-mqueue.mount sys-kernel-config.mount \ + sys-kernel-debug.mount sys-fs-fuse-connections.mount \ + systemd-sysctl.service systemd-ask-password-console.path +@@ -5430,7 +5424,7 @@ USER_BUSNAMES_TARGET_WANTS = + SYSTEM_UNIT_ALIASES = $(am__append_188) $(am__append_199) \ + $(am__append_210) $(am__append_232) $(am__append_239) \ + $(am__append_249) $(am__append_271) $(am__append_291) \ +- $(am__append_308) graphical.target default.target \ ++ $(am__append_307) graphical.target default.target \ + reboot.target ctrl-alt-del.target getty@.service \ + autovt@.service + USER_UNIT_ALIASES = $(systemunitdir)/shutdown.target shutdown.target \ +@@ -9182,8 +9176,8 @@ DISTCHECK_CONFIGURE_FLAGS = \ + --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ + --with-pamconfdir=$$dc_install_base/$(pamconfdir) \ + --with-rootprefix=$$dc_install_base --enable-compat-libs \ +- $(am__append_310) $(am__append_311) $(am__append_312) \ +- $(am__append_313) ++ $(am__append_309) $(am__append_310) $(am__append_311) \ ++ $(am__append_312) + www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd + OBJECT_VARIABLES := $(filter %_OBJECTS,$(.VARIABLES)) + ALL_OBJECTS := $(foreach v,$(OBJECT_VARIABLES),$($(v))) -- http://lists.linuxfromscratch.org/listinfo/patches FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
