From 557ed06daa86e6048dcb0477d9453373095f1eed Mon Sep 17 00:00:00 2001 From: vdutta Date: Wed, 13 Apr 2022 16:26:36 +0530 Subject: [PATCH] bulkdata: Added ssl variants to align with bbf variants --- bulkdata/Makefile | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/bulkdata/Makefile b/bulkdata/Makefile index 9ef39e7da..eb4a96d36 100755 --- a/bulkdata/Makefile +++ b/bulkdata/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bulkdata -PKG_VERSION:=1.0.4 +PKG_VERSION:=1.0.5 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) @@ -19,23 +19,41 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME) +define Package/bulkdata/default SECTION:=utils CATEGORY:=Utilities SUBMENU:=TRx69 TITLE:=BBF BulkData Collection - DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm +libbbf_api + DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbf_api endef -define Package/$(PKG_NAME)/description - BBF BulkData Collection +define Package/bulkdata-mbedtls + $(Package/bulkdata/default) + TITLE += (mbedtls) + DEPENDS += +libbbfdm-mbedtls + VARIANT:=mbedtls + DEFAULT_VARIANT:=1 +endef + +define Package/bulkdata-openssl + $(Package/bulkdata/default) + TITLE += (openssl) + DEPENDS += +libbbfdm-openssl + CONFLICTS := bulkdata-mbedtls + VARIANT:=openssl +endef + +define Package/bulkdata-wolfssl + $(Package/bulkdata/default) + TITLE += (wolfssl) + DEPENDS += +libbbfdm-wolfssl + CONFLICTS := bulkdata-mbedtls bulkdata-openssl + VARIANT:=wolfssl endef TARGET_CFLAGS += \ @@ -48,7 +66,7 @@ define Build/Prepare endef endif -define Package/$(PKG_NAME)/install +define Package/bulkdata/default/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/lib/bbfdm @@ -56,4 +74,10 @@ define Package/$(PKG_NAME)/install $(CP) ./files/* $(1)/ endef -$(eval $(call BuildPackage,$(PKG_NAME))) +Package/bulkdata-openssl/install = $(Package/bulkdata/default/install) +Package/bulkdata-wolfssl/install = $(Package/bulkdata/default/install) +Package/bulkdata-mbedtls/install = $(Package/bulkdata/default/install) + +$(eval $(call BuildPackage,bulkdata-openssl)) +$(eval $(call BuildPackage,bulkdata-wolfssl)) +$(eval $(call BuildPackage,bulkdata-mbedtls))