bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

batman-adv: upgrade package to latest release 2012.2.0

Browse Source 
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>



git-svn-id: svn://svn.openwrt.org/openwrt/packages@32342 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
marek 2012-06-13 18:26:26 +00:00
parent fa0d4e3fa1
commit 303200f32c
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/batman-adv/Config.in
View File

@ -3,6 +3,10 @@ config KMOD_BATMAN_ADV_DEBUG_LOG
bool "enable verbose debug logging" bool "enable verbose debug logging"
depends PACKAGE_kmod-batman-adv depends PACKAGE_kmod-batman-adv
default n default n
config KMOD_BATMAN_ADV_BLA
bool "enable bridge loop avoidance"
depends PACKAGE_kmod-batman-adv
default y
config KMOD_BATMAN_ADV_BATCTL config KMOD_BATMAN_ADV_BATCTL
bool "enable batctl" bool "enable batctl"
depends PACKAGE_kmod-batman-adv depends PACKAGE_kmod-batman-adv

11
net/batman-adv/Makefile
View File

@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv PKG_NAME:=batman-adv
PKG_VERSION:=2012.1.0 PKG_VERSION:=2012.2.0
BATCTL_VERSION:=2012.1.0 BATCTL_VERSION:=2012.2.0
PKG_MD5SUM:=a66fdc92c677aadae339073c560a454e PKG_MD5SUM:=68967ed1df709de18ab795722dde9341
BATCTL_MD5SUM:=afdc15c886f27f7740212db50db47190 BATCTL_MD5SUM:=7abd284098c514d3f2858e8a956c495e
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
@ -53,7 +53,8 @@ MAKE_BATMAN_ADV_ARGS += \
SUBDIRS="$(PKG_BUILD_DIR)" \ SUBDIRS="$(PKG_BUILD_DIR)" \
PWD="$(PKG_BUILD_DIR)" \ PWD="$(PKG_BUILD_DIR)" \
LINUX_VERSION="$(LINUX_VERSION)" \ LINUX_VERSION="$(LINUX_VERSION)" \
CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),y,n) \ CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),y,n) \
CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_BLA),y,n) \
REVISION="" all REVISION="" all
MAKE_BATCTL_ARGS += \ MAKE_BATCTL_ARGS += \

1
net/batman-adv/files/etc/config/batman-adv
View File

@ -11,6 +11,7 @@ config 'mesh' 'bat0'
option 'log_level' option 'log_level'
option 'orig_interval' option 'orig_interval'
option 'vis_mode' option 'vis_mode'
option 'bridge_loop_avoidance'
# yet another batX instance # yet another batX instance
# config 'mesh' 'bat5' # config 'mesh' 'bat5'

6
net/batman-adv/files/lib/batman-adv/config.sh
View File

@ -11,7 +11,7 @@ bat_load_module()
bat_config() bat_config()
{ {
local mesh="$1" local mesh="$1"
local aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval hop_penalty vis_mode local aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval hop_penalty vis_mode bridge_loop_avoidance
config_get aggregated_ogms "$mesh" aggregated_ogms config_get aggregated_ogms "$mesh" aggregated_ogms
config_get bonding "$mesh" bonding config_get bonding "$mesh" bonding
@ -24,6 +24,9 @@ bat_config()
config_get hop_penalty "$mesh" hop_penalty config_get hop_penalty "$mesh" hop_penalty
config_get vis_mode "$mesh" vis_mode config_get vis_mode "$mesh" vis_mode
config_get ap_isolation "$mesh" ap_isolation config_get ap_isolation "$mesh" ap_isolation
config_get bridge_loop_avoidance "$mesh" bridge_loop_avoidance
[ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1
[ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval [ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval
[ -n "$hop_penalty" ] && echo $hop_penalty > /sys/class/net/$mesh/mesh/hop_penalty [ -n "$hop_penalty" ] && echo $hop_penalty > /sys/class/net/$mesh/mesh/hop_penalty
@ -36,6 +39,7 @@ bat_config()
[ -n "$gw_sel_class" ] && echo $gw_sel_class > /sys/class/net/$mesh/mesh/gw_sel_class [ -n "$gw_sel_class" ] && echo $gw_sel_class > /sys/class/net/$mesh/mesh/gw_sel_class
[ -n "$vis_mode" ] && echo $vis_mode > /sys/class/net/$mesh/mesh/vis_mode [ -n "$vis_mode" ] && echo $vis_mode > /sys/class/net/$mesh/mesh/vis_mode
[ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation [ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation
[ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance
} }
bat_add_interface() bat_add_interface()