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

[batman] bump revision / handle multiple HNA / deal with DEVELOPER=1 properly

Browse source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/batman@15917 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
Marek Lindner 2009-05-18 17:49:15 +00:00
parent f9ceca672a
commit 7248297814
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=batmand PKG_NAME:=batmand
PKG_REV:=1249 PKG_REV:=1267
PKG_VERSION:=r$(PKG_REV) PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\"
@ -105,15 +105,15 @@ MAKE_BATGAT_ARGS += \
define Build/Configure define Build/Configure
endef endef
ifneq ($(DEVEL_CONFIG)$(CONFIG_PACKAGE_batmand),) ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),)
BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS) BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS)
endif endif
ifneq ($(CONFIG_DEVEL)$(CONFIG_PACKAGE_vis),) ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_vis),)
BUILD_VIS := $(MAKE) -C $(PKG_BUILD_DIR)/vis $(MAKE_VIS_ARGS) BUILD_VIS := $(MAKE) -C $(PKG_BUILD_DIR)/vis $(MAKE_VIS_ARGS)
endif endif
ifneq ($(CONFIG_DEVEL)$(CONFIG_PACKAGE_kmod-batgat),) ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)
BUILD_BATGAT := $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATGAT_ARGS) BUILD_BATGAT := $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATGAT_ARGS)
endif endif

2
files/etc/config/batmand
View file

@ -1,6 +1,6 @@
config batmand general config batmand general
option interface ath0 option interface ath0
option announce option hna
option gateway_class option gateway_class
option originator_interval option originator_interval
option preferred_gateway option preferred_gateway

9
files/etc/init.d/batmand
View file

@ -8,7 +8,7 @@ start () {
echo $1 Error, you must specify at least a network interface echo $1 Error, you must specify at least a network interface
exit exit
fi fi
announce=$(uci get batmand.general.announce) hnas=$(uci get batmand.general.hna)
gateway_class=$(uci get batmand.general.gateway_class) gateway_class=$(uci get batmand.general.gateway_class)
originator_interval=$(uci get batmand.general.originator_interval) originator_interval=$(uci get batmand.general.originator_interval)
preferred_gateway=$(uci get batmand.general.preferred_gateway) preferred_gateway=$(uci get batmand.general.preferred_gateway)
@ -19,9 +19,10 @@ start () {
disable_aggregation=$(uci get batmand.general.disable_aggregation) disable_aggregation=$(uci get batmand.general.disable_aggregation)
batman_args="" batman_args=""
if [ $announce ]; then for hna in $hnas
batman_args=${batman_args}'-a '$announce' ' do
fi batman_args=${batman_args}'-a '$hna' '
done
if [ $gateway_class ]; then if [ $gateway_class ]; then
batman_args=${batman_args}'-g '$gateway_class' ' batman_args=${batman_args}'-g '$gateway_class' '