Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12306 from d-bourdon/coova-enable-json

Browse source 
coova-chilli: Add json interface build option
This commit is contained in:
Rosen Penev 2020-06-06 09:32:47 -07:00 committed by GitHub
commit 64cd2fe015
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/coova-chilli/Config.in
View file

@ -26,6 +26,10 @@ config COOVACHILLI_LARGELIMITS
bool "Enable larger limits for use with non-embedded systems" bool "Enable larger limits for use with non-embedded systems"
default n default n
config COOVACHILLI_JSONINTERFACE
bool "Enable the JSON interface for the CoovaChilli Controller"
default n
choice choice
prompt "SSL library" prompt "SSL library"
default COOVACHILLI_NOSSL default COOVACHILLI_NOSSL

8
net/coova-chilli/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=coova-chilli PKG_NAME:=coova-chilli
PKG_VERSION:=1.5 PKG_VERSION:=1.5
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/coova/coova-chilli/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/coova/coova-chilli/tar.gz/$(PKG_VERSION)?
@ -24,6 +24,7 @@ PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=0 PKG_BUILD_PARALLEL:=0
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
COOVACHILLI_JSONINTERFACE \
COOVACHILLI_LARGELIMITS \ COOVACHILLI_LARGELIMITS \
COOVACHILLI_MINIPORTAL \ COOVACHILLI_MINIPORTAL \
COOVACHILLI_NOSSL \ COOVACHILLI_NOSSL \
@ -43,7 +44,8 @@ define Package/coova-chilli
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+kmod-tun +librt +COOVACHILLI_MINIPORTAL:haserl \ DEPENDS:=+kmod-tun +librt +COOVACHILLI_MINIPORTAL:haserl \
+COOVACHILLI_WOLFSSL:libwolfssl +COOVACHILLI_OPENSSL:libopenssl +COOVACHILLI_WOLFSSL:libwolfssl +COOVACHILLI_OPENSSL:libopenssl \
+COOVACHILLI_JSONINTERFACE:libjson-c
TITLE:=Wireless LAN HotSpot controller (Coova Chilli Version) TITLE:=Wireless LAN HotSpot controller (Coova Chilli Version)
URL:=https://coova.github.io/ URL:=https://coova.github.io/
MENU:=1 MENU:=1
@ -111,6 +113,8 @@ define Build/Configure
$(if $(CONFIG_COOVACHILLI_MINIPORTAL),--enable,--disable)-miniportal \ $(if $(CONFIG_COOVACHILLI_MINIPORTAL),--enable,--disable)-miniportal \
$(if $(CONFIG_COOVACHILLI_USERAGENT),--enable,--disable)-useragent \ $(if $(CONFIG_COOVACHILLI_USERAGENT),--enable,--disable)-useragent \
$(if $(CONFIG_COOVACHILLI_LARGELIMITS),--enable,--disable)-largelimits \ $(if $(CONFIG_COOVACHILLI_LARGELIMITS),--enable,--disable)-largelimits \
$(if $(CONFIG_COOVACHILLI_JSONINTERFACE),--enable,--disable)-libjson \
$(if $(CONFIG_COOVACHILLI_JSONINTERFACE),--enable,--disable)-json \
$(if $(CONFIG_COOVACHILLI_UAMDOMAINFILE),--enable,--disable)-uamdomainfile \ $(if $(CONFIG_COOVACHILLI_UAMDOMAINFILE),--enable,--disable)-uamdomainfile \
$(if $(CONFIG_IPV6),--with,--without)-ipv6 \ $(if $(CONFIG_IPV6),--with,--without)-ipv6 \
$(if $(CONFIG_COOVACHILLI_WOLFSSL),--with,--without)-cyassl \ $(if $(CONFIG_COOVACHILLI_WOLFSSL),--with,--without)-cyassl \