From a7f6dc9f8b9602441a1b56bbe73d80711e2c640f Mon Sep 17 00:00:00 2001 From: Daniel Dickinson Date: Wed, 22 Jun 2016 21:12:16 -0400 Subject: px5g: Create mbedtls variant px5g has been listed as a blocker for switching to new mbedtls as the default, therefore make and mbedtls variant of px5g so that an new mbedtls-only image can be created. Signed-off-by: Daniel Dickinson --- package/utils/px5g/Makefile | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) (limited to 'package/utils/px5g/Makefile') diff --git a/package/utils/px5g/Makefile b/package/utils/px5g/Makefile index 4714d936b6..e924ab30fb 100644 --- a/package/utils/px5g/Makefile +++ b/package/utils/px5g/Makefile @@ -10,36 +10,53 @@ include $(TOPDIR)/rules.mk PKG_NAME:=px5g PKG_RELEASE:=4 PKG_LICENSE:=LGPL-2.1 +PKG_BUILD_DIR:=$(BUILD_DIR)/px5g-$(BUILD_VARIANT) PKG_USE_MIPS16:=0 include $(INCLUDE_DIR)/package.mk -define Package/px5g +define Package/px5g/Template SECTION:=utils CATEGORY:=Utilities - TITLE:=X.509 certificate generator (using PolarSSL) + TITLE:=X.509 certificate generator (using $(1)) MAINTAINER:=Jo-Philipp Wich - DEPENDS:=+libpolarssl + DEPENDS:=+lib$(1) + PROVIDES:=px5g + VARIANT:=$(1) endef -define Package/px5g/description +define Package/px5g-polarssl/description Px5g is a tiny standalone X.509 certificate generator. It suitable to create key files and certificates in DER and PEM format for use with stunnel, uhttpd and others. endef +Package/px5g-mbedtls=$(call Package/px5g/Template,mbedtls) +Package/px5g-polarssl=$(call Package/px5g/Template,polarssl) +Package/px5g-mbedtls/description=$(Package/px5g-polarssl/description) + define Build/Prepare mkdir -p $(PKG_BUILD_DIR) endef +ifeq ($(BUILD_VARIANT),mbedtls) +TARGET_CFLAGS += -DMBEDTLS +TARGET_LDFLAGS := -lmbedtls -lmbedx509 -lmbedcrypto +else +TARGET_LDFLAGS := -lpolarssl +endif + define Build/Compile - $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/px5g px5g.c -lpolarssl + $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/px5g px5g.c $(TARGET_LDFLAGS) endef -define Package/px5g/install +define Package/px5g-polarssl/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/px5g $(1)/usr/sbin/px5g endef -$(eval $(call BuildPackage,px5g)) +Package/px5g-mbedtls/install=$(Package/px5g-polarssl/install) + +$(eval $(call BuildPackage,px5g-polarssl)) +$(eval $(call BuildPackage,px5g-mbedtls)) -- cgit v1.2.3