summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Capoano <f.capoano@openwisp.io>2022-05-28 14:49:30 -0400
committerRosen Penev <rosenp@gmail.com>2022-06-01 13:53:15 -0700
commitf0e94f3add1cf609d4fd4b320bd842a374b45659 (patch)
treeba555f398b115759f76802a7d07c3d80582f6ef2
parentbfe255064eeed30d06cbd969e4be36a89d76d0eb (diff)
openwisp-config: update to 1.0.0
Signed-off-by: Federico Capoano <f.capoano@openwisp.io>
-rw-r--r--admin/openwisp-config/Makefile53
1 files changed, 22 insertions, 31 deletions
diff --git a/admin/openwisp-config/Makefile b/admin/openwisp-config/Makefile
index 5ea2698ed..8a7713d2c 100644
--- a/admin/openwisp-config/Makefile
+++ b/admin/openwisp-config/Makefile
@@ -5,48 +5,42 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=openwisp-config
-PKG_SOURCE_VERSION:=0.5.0
PKG_RELEASE:=1
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/openwisp/openwisp-config.git
-PKG_MIRROR_HASH:=337a3a9542a0898da9f951256b0d19b6bc87ced98f4ec6dc9646172b551880ef
PKG_MAINTAINER:=Federico Capoano <f.capoano@openwisp.io>
PKG_LICENSE:=GPL3.0-or-later
+
+PKG_SOURCE_URL:=https://github.com/openwisp/openwisp-config.git
+PKG_MIRROR_HASH:=f0b0866b27a7a75bc33c3bbc4780dd99f5ae693226012ae04e63a303172c2c38
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=1.0.0
PKGARCH:=all
include $(INCLUDE_DIR)/package.mk
-define Package/openwisp-config/default
- TITLE:=Remote configuration management agent ($(2) variant)
- CATEGORY:=Administration
- SECTION:=admin
- SUBMENU:=openwisp
- DEPENDS:=+curl +lua +libuci-lua +luafilesystem +luci-lib-nixio $(3)
- VARIANT:=$(1)
- PKGARCH:=all
- URL:=http://openwisp.org
+define Package/openwisp-config
+ TITLE:=Remote configuration management agent
+ CATEGORY:=Administration
+ SECTION:=admin
+ SUBMENU:=openwisp
+ DEPENDS:=+curl \
+ +lua \
+ +libuci-lua \
+ +luafilesystem \
+ +luci-lib-nixio \
+ +ca-certificates
+ PKGARCH:=all
+ URL:=https://openwisp.org
endef
-Package/openwisp-config-openssl=$(call Package/openwisp-config/default,openssl,OpenSSL,+ca-certificates +libopenssl)
-Package/openwisp-config-mbedtls=$(call Package/openwisp-config/default,mbedtls,mbedTLS,+ca-certificates +libmbedtls)
-Package/openwisp-config-wolfssl=$(call Package/openwisp-config/default,wolfssl,WolfSSL,+ca-certificates +libwolfssl)
-Package/openwisp-config-nossl=$(call Package/openwisp-config/default,nossl,No SSL)
-
define Build/Compile
endef
-define Package/openwisp-config-$(BUILD_VARIANT)/conffiles
+define Package/openwisp-config/conffiles
/etc/config/openwisp
endef
-CONFIG_OPENWISP_UCI:=ssl
-
-ifeq ($(BUILD_VARIANT),nossl)
- CONFIG_OPENWISP_UCI:=nossl
-endif
-
-define Package/openwisp-config-$(BUILD_VARIANT)/install
+define Package/openwisp-config/install
$(INSTALL_DIR) \
$(1)/usr/sbin \
$(1)/etc/init.d \
@@ -62,7 +56,7 @@ define Package/openwisp-config-$(BUILD_VARIANT)/install
$(PKG_BUILD_DIR)/openwisp-config/files/openwisp.init \
$(1)/etc/init.d/openwisp_config
- $(INSTALL_CONF) $(PKG_BUILD_DIR)/openwisp-config/files/openwisp-$(CONFIG_OPENWISP_UCI).config \
+ $(INSTALL_CONF) $(PKG_BUILD_DIR)/openwisp-config/files/openwisp.config \
$(1)/etc/config/openwisp
$(INSTALL_BIN) \
@@ -104,7 +98,4 @@ define Package/openwisp-config-$(BUILD_VARIANT)/install
$(CP) $(PKG_BUILD_DIR)/VERSION $(1)/etc/openwisp/
endef
-$(eval $(call BuildPackage,openwisp-config-openssl))
-$(eval $(call BuildPackage,openwisp-config-mbedtls))
-$(eval $(call BuildPackage,openwisp-config-wolfssl))
-$(eval $(call BuildPackage,openwisp-config-nossl))
+$(eval $(call BuildPackage,openwisp-config))