mirror of
https://dev.iopsys.eu/feed/iopsys.git
synced 2025-12-10 07:44:50 +01:00
Merge branch 'devel' of dev.iopsys.eu:feed/iopsys into devel
This commit is contained in:
commit
97fd03d966
5 changed files with 12 additions and 7 deletions
|
|
@ -5,10 +5,10 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=ieee1905
|
||||
PKG_VERSION:=2.0.2
|
||||
PKG_VERSION:=2.0.3
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_VERSION:=77c8a0cbae7780c53b7edee8c789a0b3eefc498a
|
||||
PKG_SOURCE_VERSION:=062770a223f2acedf00e9b3e754813ac64641ee7
|
||||
PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@ config meshcomms 'global'
|
|||
option debug_level 2
|
||||
option port 8888
|
||||
option cmdu_event false
|
||||
option discovery_timer 300
|
||||
option discovery_timer 60
|
||||
option multiap_plugin false
|
||||
|
||||
#config al-iface
|
||||
# option enabled '1'
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@ validate_global_section()
|
|||
'debug_level:uinteger:5' \
|
||||
'port:port:8888' \
|
||||
'cmdu_event:bool:true' \
|
||||
'discovery_timer:uinteger:60'
|
||||
'discovery_timer:uinteger:60' \
|
||||
'multiap_plugin:bool:false'
|
||||
}
|
||||
|
||||
validate_ieee1905_section()
|
||||
|
|
@ -111,6 +112,7 @@ configure_interface()
|
|||
configure_meshcomms()
|
||||
{
|
||||
local enabled almac basemacint mapall debug_level port l3device basemac intf registrar cmdu_event discovery_timer
|
||||
local multiap_plugin
|
||||
|
||||
validate_global_section global || {
|
||||
echo "Validation of global section failed"
|
||||
|
|
@ -151,6 +153,7 @@ configure_meshcomms()
|
|||
json_add_int port ${port}
|
||||
json_add_int cmdu_event ${cmdu_event}
|
||||
json_add_int discovery_timer ${discovery_timer}
|
||||
json_add_int multiap_plugin ${multiap_plugin}
|
||||
json_close_object
|
||||
|
||||
json_dump >${MESH_CONF}
|
||||
|
|
|
|||
|
|
@ -191,7 +191,8 @@ configure_obuspa() {
|
|||
export USP_BOARD_IFNAME=${l3device}
|
||||
|
||||
# Set this variable for root user
|
||||
echo "export USP_BOARD_IFNAME=${l3device}">/root/.profile
|
||||
grep -q USP_BOARD_IFNAME /root/.profile || \
|
||||
echo "export USP_BOARD_IFNAME=${l3device}" >> /root/.profile
|
||||
|
||||
[ -f $cert ] && certificate=$cert
|
||||
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=wfamap
|
||||
PKG_VERSION:=1.0.0
|
||||
PKG_VERSION:=1.0.1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_VERSION:=1596260b43481c44d2a6a2fb15fe5107c5b58b33
|
||||
PKG_SOURCE_VERSION:=97ced20d19a2c8373c12c488917439426ab372a1
|
||||
PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfamap.git
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue