Skip to contentSkip to conversation

systemd: disable ldconfig through configure option

PATCH New Gabe Evans 2 participants 2 messages Nov 3, 2015

lore
Share & tools
lore

Gabe Evans

author
#0 lore raw

PATCH 1/1 systemd: disable ldconfig through configure option

Systemd v216+ includes a configure option to disable ldconfig.

Signed-off-by Gabe Evans <[email protected]>
---
 package/systemd/systemd.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
package/systemd/systemd.mk +1 -7
index 414dc0d..35dac83 100644
@@ -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
Signature · 1 line
1.9.1
Applied
#1 lore raw

PATCH 1/1 systemd: disable ldconfig through configure option

Dear Gabe Evans,

Quoted 6 lines · Gabe Evans

Systemd v216+ includes a configure option to disable ldconfig.

Signed-off-by Gabe Evans <[email protected]>
---
 package/systemd/systemd.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com