From: Paul Wassi <p.wassi@gmx.at>
Date: Mon, 12 Mar 2018 19:19:49 +0000 (+0100)
Subject: package/libs/mbedtls: add package with some mbedtls binaries.
X-Git-Tag: v18.06.0-rc1~506
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ef6939b0afec410dd2db6d4382edc2231baf9a4c;p=oweals%2Fopenwrt.git

package/libs/mbedtls: add package with some mbedtls binaries.

Add some basic binaries required for private key and CSR generation.

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
---

diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 898880d453..8ac4e3b13e 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -24,7 +24,6 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/mbedtls/Default
-  SUBMENU:=SSL
   TITLE:=Embedded SSL
   URL:=https://tls.mbed.org
 endef
@@ -38,15 +37,30 @@ define Package/libmbedtls
 $(call Package/mbedtls/Default)
   SECTION:=libs
   CATEGORY:=Libraries
+  SUBMENU:=SSL
   TITLE+= (library)
   ABI_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
 endef
 
+define Package/mbedtls-util
+$(call Package/mbedtls/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE+= (utilities)
+  DEPENDS:=+libmbedtls
+endef
+
 define Package/libmbedtls/description
 $(call Package/mbedtls/Default/description)
 This package contains the mbedtls library.
 endef
 
+define Package/mbedtls-util/description
+$(call Package/mbedtls/Default/description)
+This package contains mbedtls helper programs for private key and
+CSR generation (gen_key, cert_req)
+endef
+
 PKG_INSTALL:=1
 
 TARGET_CFLAGS += -ffunction-sections -fdata-sections
@@ -55,7 +69,7 @@ CMAKE_OPTIONS += \
 	-DCMAKE_BUILD_TYPE:String="Release" \
 	-DUSE_SHARED_MBEDTLS_LIBRARY:Bool=ON \
 	-DENABLE_TESTING:Bool=OFF \
-	-DENABLE_PROGRAMS:Bool=OFF \
+	-DENABLE_PROGRAMS:Bool=ON
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
@@ -70,4 +84,11 @@ define Package/libmbedtls/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/
 endef
 
+define Package/mbedtls-util/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gen_key $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cert_req $(1)/usr/bin/
+endef
+
 $(eval $(call BuildPackage,libmbedtls))
+$(eval $(call BuildPackage,mbedtls-util))