diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-02-21 14:24:32 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-02-21 16:05:42 +0100 |
| commit | 709d10e220071da00ecbf6d6f5281719bee58a46 (patch) | |
| tree | 340487140206cb884ac767eab3fbcf7b9ab4df88 /package/utils/px5g | |
| parent | 7df0069bb5c51907ba54a5342c755ad8e19e57a9 (diff) | |
| download | upstream-709d10e220071da00ecbf6d6f5281719bee58a46.tar.gz upstream-709d10e220071da00ecbf6d6f5281719bee58a46.tar.bz2 upstream-709d10e220071da00ecbf6d6f5281719bee58a46.zip | |
px5g: replace px5g-standalone with a statically linked variant of px5g-mbedtls
px5g-standalone only supports SHA1 for certificates, which is strongly
deprecated. The new px5g-standalone is about 27k bigger (compressed),
and has identical behavior to px5g-mbedtls (it uses SHA256).
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/utils/px5g')
| -rw-r--r-- | package/utils/px5g/Makefile | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/package/utils/px5g/Makefile b/package/utils/px5g/Makefile index d33938173c..6fd73e3a48 100644 --- a/package/utils/px5g/Makefile +++ b/package/utils/px5g/Makefile @@ -10,10 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=px5g PKG_RELEASE:=4 PKG_LICENSE:=LGPL-2.1 -PKG_BUILD_DIR:=$(BUILD_DIR)/px5g +PKG_BUILD_DIR:=$(BUILD_DIR)/px5g-$(BUILD_VARIANT) PKG_USE_MIPS16:=0 +PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io> + include $(INCLUDE_DIR)/package.mk define Package/px5g-mbedtls @@ -21,9 +23,9 @@ define Package/px5g-mbedtls CATEGORY:=Utilities SUBMENU:=Encryption TITLE:=X.509 certificate generator (using mbedtls) - MAINTAINER:=Jo-Philipp Wich <jo@mein.io> DEPENDS:=+libmbedtls PROVIDES:=px5g + VARIANT:=mbedtls endef define Package/px5g-mbedtls/description @@ -32,12 +34,27 @@ define Package/px5g-mbedtls/description and PEM format for use with stunnel, uhttpd and others. endef +define Package/px5g-standalone + SECTION:=utils + CATEGORY:=Utilities + SUBMENU:=Encryption + TITLE:=X.509 certificate generator (standalone) + VARIANT:=standalone +endef +Package/px5g-standalone/description = $(Package/px5g-mbedtls/description) + define Build/Prepare mkdir -p $(PKG_BUILD_DIR) endef TARGET_LDFLAGS := -lmbedtls -lmbedx509 -lmbedcrypto +ifeq ($(BUILD_VARIANT),standalone) + TARGET_LDFLAGS := -Wl,-Bstatic $(TARGET_LDFLAGS) -Wl,-Bdynamic +endif + +TARGET_CFLAGS += -Wl,--gc-sections + define Build/Compile $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/px5g px5g.c $(TARGET_LDFLAGS) endef @@ -47,4 +64,7 @@ define Package/px5g-mbedtls/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/px5g $(1)/usr/sbin/px5g endef +Package/px5g-standalone/install = $(Package/px5g-mbedtls/install) + $(eval $(call BuildPackage,px5g-mbedtls)) +$(eval $(call BuildPackage,px5g-standalone)) |