From c6aa56e081bd31981a547d8f2db060fe05a75d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= Date: Tue, 17 Feb 2015 16:43:58 +0100 Subject: [PATCH] openldap: Make client binary install configurable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some OpenLDAP deployment only need the client libraries and not the client tools, so make the tool installation optional. [Thomas: implement the for loop in make rather than in shell.] Signed-off-by: Stefan Sørensen Signed-off-by: Thomas Petazzoni --- package/openldap/Config.in | 12 ++++++++++++ package/openldap/openldap.mk | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/package/openldap/Config.in b/package/openldap/Config.in index 1f0b1eabc3..3085a5c87e 100644 --- a/package/openldap/Config.in +++ b/package/openldap/Config.in @@ -10,6 +10,18 @@ config BR2_PACKAGE_OPENLDAP http://www.openldap.org/ +if BR2_PACKAGE_OPENLDAP + +config BR2_PACKAGE_OPENLDAP_CLIENTS + bool "openldap client binaries" + default y + help + Install the OpenLDAP client tools (ldapadd, ldapcompare, ldapdelete, + ldapexop, ldapmodify, ldapmodrdn, ldappasswd, ldapsearch, ldapurl, + ldapwhoami) + +endif + comment "openldap needs a toolchain w/ wchar" depends on BR2_USE_MMU # needs fork() depends on !BR2_USE_WCHAR diff --git a/package/openldap/openldap.mk b/package/openldap/openldap.mk index 332b2c4ddf..991d36953f 100644 --- a/package/openldap/openldap.mk +++ b/package/openldap/openldap.mk @@ -55,4 +55,16 @@ OPENLDAP_CONF_OPTS += \ # executable it is supposed to install, resulting in an error. OPENLDAP_MAKE_ENV = STRIP="$(TARGET_STRIP)" +ifeq ($(BR2_PACKAGE_OPENLDAP_CLIENTS),) +OPENLDAP_CLIENTS = \ + ldapurl ldapexop ldapcompare ldapwhoami \ + ldappasswd ldapmodrdn ldapdelete ldapmodify \ + ldapsearch +define OPENLDAP_REMOVE_CLIENTS + $(RM) -f $(foreach p,$(OPENLDAP_CLIENTS),$(TARGET_DIR)/usr/bin/$(p)) + $(RM) -rf $(TARGET_DIR)/etc/openldap +endef +OPENLDAP_POST_INSTALL_TARGET_HOOKS += OPENLDAP_REMOVE_CLIENTS +endif + $(eval $(autotools-package))