From 3a41e34cdacee2cc74f5645f4d9cb6fc05eb4b43 Mon Sep 17 00:00:00 2001
From: Marek Lindner <lindner_marek@yahoo.de>
Date: Mon, 18 May 2009 17:49:15 +0000
Subject: [PATCH] [batman] bump revision / handle multiple HNA / deal with
 DEVELOPER=1 properly

SVN-Revision: 15917
---
 net/batman-advanced/Makefile        | 12 ++++++------
 net/batman/Makefile                 |  8 ++++----
 net/batman/files/etc/config/batmand |  2 +-
 net/batman/files/etc/init.d/batmand |  9 +++++----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile
index 06e818526d..c442302424 100644
--- a/net/batman-advanced/Makefile
+++ b/net/batman-advanced/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_REV:=1220
+PKG_REV:=1267
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 
@@ -60,14 +60,14 @@ define KernelPackage/batman-adv-kernelland
 $(call Package/batman-adv/Default)
   SUBMENU:=Network Support
   DEPENDS:=@LINUX_2_6
-  TITLE:=Kernel routing module for B.A.T.M.A.N. layer 2
+  TITLE:=B.A.T.M.A.N. layer 2
   FILES:=$(PKG_KMOD_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,batman-adv)
 endef
 
 
 define KernelPackage/batman-adv-kernelland/description
-Kernel routing module for B.A.T.M.A.N. layer 2
+B.A.T.M.A.N. layer 2
 endef
 
 MAKE_BATADV_USERSPACE_ARGS += \
@@ -105,15 +105,15 @@ MAKE_BATTOOL_ARGS += \
 define Build/Configure
 endef
 
-ifneq ($(CONFIG_DEVEL)$(CONFIG_PACKAGE_batman-adv-userspace),)
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batman-adv-userspace),)
 	BUILD_ADV = $(MAKE) -C $(PKG_BUILD_DIR)/batman-adv-userspace $(MAKE_BATADV_USERSPACE_ARGS)
 endif
 
-ifneq ($(CONFIG_DEVEL)$(CONFIG_PACKAGE_kmod-batman-adv-kernelland),)
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batman-adv-kernelland),)
         BUILD_KMOD_ADV = $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATADV_KERNELLAND_ARGS)
 endif
 
-ifneq ($(CONFIG_DEVEL)$(CONFIG_PACKAGE_battool),)
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_battool),)
         BUILD_BATTOOL = $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_BATTOOL_ARGS)
 endif
 
diff --git a/net/batman/Makefile b/net/batman/Makefile
index 549952f648..052039b5cf 100644
--- a/net/batman/Makefile
+++ b/net/batman/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=batmand
-PKG_REV:=1249
+PKG_REV:=1267
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\"
@@ -105,15 +105,15 @@ MAKE_BATGAT_ARGS += \
 define Build/Configure
 endef
 
-ifneq ($(DEVEL_CONFIG)$(CONFIG_PACKAGE_batmand),)
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),)
 	BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS)
 endif
 
-ifneq ($(CONFIG_DEVEL)$(CONFIG_PACKAGE_vis),)
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_vis),)
 	BUILD_VIS := $(MAKE) -C $(PKG_BUILD_DIR)/vis $(MAKE_VIS_ARGS)
 endif
 	
-ifneq ($(CONFIG_DEVEL)$(CONFIG_PACKAGE_kmod-batgat),)
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)
 	BUILD_BATGAT := $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATGAT_ARGS)
 endif
 	        
diff --git a/net/batman/files/etc/config/batmand b/net/batman/files/etc/config/batmand
index a67fa5d319..6d1f3beb49 100644
--- a/net/batman/files/etc/config/batmand
+++ b/net/batman/files/etc/config/batmand
@@ -1,6 +1,6 @@
 config batmand general
 	option interface		ath0
-	option announce			
+	option hna			
 	option gateway_class		
 	option originator_interval
 	option preferred_gateway	
diff --git a/net/batman/files/etc/init.d/batmand b/net/batman/files/etc/init.d/batmand
index 5da2062b52..411f025025 100644
--- a/net/batman/files/etc/init.d/batmand
+++ b/net/batman/files/etc/init.d/batmand
@@ -8,7 +8,7 @@ start () {
 		echo $1 Error, you must specify at least a network interface
 		exit
 	fi
-	announce=$(uci get batmand.general.announce)
+	hnas=$(uci get batmand.general.hna)
 	gateway_class=$(uci get batmand.general.gateway_class)
 	originator_interval=$(uci get batmand.general.originator_interval)
 	preferred_gateway=$(uci get batmand.general.preferred_gateway)
@@ -19,9 +19,10 @@ start () {
 	disable_aggregation=$(uci get batmand.general.disable_aggregation)
 	batman_args=""
 
-	if [ $announce ]; then
-		batman_args=${batman_args}'-a '$announce' '
-	fi
+	for hna in $hnas
+	   do
+	      batman_args=${batman_args}'-a '$hna' '
+	   done
 
 	if [ $gateway_class ]; then
 		batman_args=${batman_args}'-g '$gateway_class' '
-- 
2.30.2