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

batman-adv: upgrade package to latest release 2012.1.0

Browse source 
Also fix hotplug scripts to load batman-adv module when necessary.

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



git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/batman-adv@31317 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
Marek Lindner 2012-04-16 17:36:28 +00:00
parent 32222b3735
commit ec48d0fc00
4 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Makefile
View file

@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv PKG_NAME:=batman-adv
PKG_VERSION:=2012.0.0 PKG_VERSION:=2012.1.0
BATCTL_VERSION:=2012.0.0 BATCTL_VERSION:=2012.1.0
PKG_MD5SUM:=f1de23457a47ca4369ee1f0e0b7fc405 PKG_MD5SUM:=a66fdc92c677aadae339073c560a454e
BATCTL_MD5SUM:=27991c2921e18657c7262e917d45106a BATCTL_MD5SUM:=afdc15c886f27f7740212db50db47190
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)
@ -47,12 +47,14 @@ endef
MAKE_BATMAN_ADV_ARGS += \ MAKE_BATMAN_ADV_ARGS += \
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
KERNELPATH="$(LINUX_DIR)" \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
PATH="$(TARGET_PATH)" \ PATH="$(TARGET_PATH)" \
$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),EXTRA_CFLAGS="-DCONFIG_BATMAN_ADV_DEBUG") \
SUBDIRS="$(PKG_BUILD_DIR)" \ SUBDIRS="$(PKG_BUILD_DIR)" \
PWD="$(PKG_BUILD_DIR)" \
LINUX_VERSION="$(LINUX_VERSION)" \ LINUX_VERSION="$(LINUX_VERSION)" \
REVISION="" modules CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),y,n) \
REVISION="" all
MAKE_BATCTL_ARGS += \ MAKE_BATCTL_ARGS += \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
@ -96,8 +98,7 @@ define Build/Patch
endef endef
define Build/Compile define Build/Compile
cp $(PKG_BUILD_DIR)/Makefile.kbuild $(PKG_BUILD_DIR)/Makefile $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATMAN_ADV_ARGS)
$(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATMAN_ADV_ARGS)
$(BATCTL_BUILD) $(BATCTL_BUILD)
endef endef

1
files/etc/hotplug.d/net/99-batman-adv
View file

@ -2,6 +2,7 @@
. /lib/batman-adv/config.sh . /lib/batman-adv/config.sh
bat_load_module
config_load batman-adv config_load batman-adv
case "$ACTION" in case "$ACTION" in

17
files/lib/batman-adv/config.sh
View file

@ -1,6 +1,15 @@
#!/bin/sh #!/bin/sh
bat_config(){ bat_load_module()
{
[ -d "/sys/module/batman_adv/" ] && return
. /etc/functions.sh
load_modules /etc/modules.d/*-lib-crc16 /etc/modules.d/*-batman-adv
}
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
@ -30,7 +39,8 @@ bat_config(){
} }
bat_add_interface(){ bat_add_interface()
{
local mesh="$1" local mesh="$1"
local interface="$2" local interface="$2"
local interfaces local interfaces
@ -47,7 +57,8 @@ bat_add_interface(){
done done
} }
bat_del_interface(){ bat_del_interface()
{
local mesh="$1" local mesh="$1"
local interface="$2" local interface="$2"
local interfaces local interfaces

1
files/usr/sbin/batman-adv
View file

@ -26,6 +26,7 @@ stop_mesh() {
# can also be used with "batman-adv start bat0" # can also be used with "batman-adv start bat0"
start() { start() {
bat_load_module
config_load batman-adv config_load batman-adv
if [ -n "$1" ]; then if [ -n "$1" ]; then