[Buildroot] [git commit] systemd: disable ldconfig through configure option

Thomas Petazzoni thomas.petazzoni at free-electrons.com
Tue Nov 3 22:46:39 UTC 2015


commit: http://git.buildroot.net/buildroot/commit/?id=a566520ef6c73f113584082749505c5dea16ccfb
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Systemd v216+ includes a configure option to disable ldconfig.

Signed-off-by: Gabe Evans <gabe at hashrabbit.co>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
---
 package/systemd/systemd.mk |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 414dc0d..35dac83 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -37,6 +37,7 @@ SYSTEMD_CONF_OPTS += \
 	--with-dbussystemservicedir=/usr/share/dbus-1/system-services \
 	--disable-efi \
 	--disable-gnuefi \
+	--disable-ldconfig \
 	--disable-tests \
 	--disable-dbus \
 	--without-python
@@ -154,17 +155,10 @@ define SYSTEMD_SANITIZE_PATH_IN_UNITS
 		-exec $(SED) 's,$(HOST_DIR),,g' {} \;
 endef
 
-# Disable ldconfig.service, as /sbin/ldconfig is not available when the
-# target is built with a glibc-based toolchain.
-define SYSTEMD_DISABLE_LDCONFIG_SERVICE_HOOK
-	rm -f $(TARGET_DIR)/lib/systemd/system/sysinit.target.wants/ldconfig.service
-endef
-
 SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
 	SYSTEMD_INSTALL_INIT_HOOK \
 	SYSTEMD_INSTALL_MACHINEID_HOOK \
 	SYSTEMD_INSTALL_RESOLVCONF_HOOK \
-	SYSTEMD_DISABLE_LDCONFIG_SERVICE_HOOK \
 	SYSTEMD_SANITIZE_PATH_IN_UNITS
 
 define SYSTEMD_USERS


More information about the buildroot mailing list