From b4681062e949347e45ba0a9dc56d0fbe339b3aa7 Mon Sep 17 00:00:00 2001
From: Marek Lindner <lindner_marek@yahoo.de>
Date: Fri, 3 Jul 2009 15:17:39 +0000
Subject: [PATCH] [batman-adv] batctl replaces battool for testing / debugging
 / configuration

SVN-Revision: 16662
---
 net/batman-advanced/Makefile                  | 36 ++++++-------------
 .../files/etc/init.d/batman-adv-kernelland    | 13 +++----
 2 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile
index 6b2e95f338..894116ef6f 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:=1289
+PKG_REV:=1334
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 
@@ -22,8 +22,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
 PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman-adv-kernelland
 
-PKG_TOOL_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-battool-install
-PKG_TOOL_BUILD_DIR:=$(PKG_BUILD_DIR)/battool
+PKG_TOOL_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-batctl-install
+PKG_TOOL_BUILD_DIR:=$(PKG_BUILD_DIR)/batctl
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -33,17 +33,6 @@ define Package/batman-adv/Default
   MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
 endef
 
-define Package/battool
-$(call Package/batman-adv/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=B.A.T.M.A.N. layer 2 debug tools
-endef
-
-define Package/battool/description
-B.A.T.M.A.N. layer 2 debug tools
-endef
-
 define KernelPackage/batman-adv-kernelland
 $(call Package/batman-adv/Default)
   SUBMENU:=Network Support
@@ -66,7 +55,7 @@ MAKE_BATADV_KERNELLAND_ARGS += \
 	LINUX_VERSION="$(LINUX_VERSION)" \
 	REVISION="$(PKG_REV)" modules
 
-MAKE_BATTOOL_ARGS += \
+MAKE_BATCTL_ARGS += \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	CCFLAGS="$(TARGET_CFLAGS)" \
 	OFLAGS="$(TARGET_CFLAGS)" \
@@ -76,7 +65,7 @@ MAKE_BATTOOL_ARGS += \
 	UNAME="Linux" \
 	INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
 	STRIP="/bin/true" \
-	battool install
+	batctl install
 
 define Build/Configure
 endef
@@ -85,26 +74,21 @@ ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batman-adv-kernelland),)
         BUILD_KMOD_ADV = $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATADV_KERNELLAND_ARGS)
 endif
 
-ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_battool),)
-        BUILD_BATTOOL = $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_BATTOOL_ARGS)
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batman-adv-kernelland),)
+        BUILD_BATCTL = $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_BATCTL_ARGS)
 endif
 
 define Build/Compile
 	cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile
 	$(BUILD_KMOD_ADV)
-	$(BUILD_BATTOOL)
+	$(BUILD_BATCTL)
 endef
 
 define KernelPackage/batman-adv-kernelland/install
-	$(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/etc/init.d/batman-adv-kernelland $(1)/etc/init.d
 	$(INSTALL_DATA) ./files/etc/config/batman-adv-kernelland $(1)/etc/config
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/batctl $(1)/usr/sbin/
 endef
 
-define Package/battool/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/battool $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,battool))
 $(eval $(call KernelPackage,batman-adv-kernelland))
diff --git a/net/batman-advanced/files/etc/init.d/batman-adv-kernelland b/net/batman-advanced/files/etc/init.d/batman-adv-kernelland
index e3e44da9c5..b8cd1b7425 100644
--- a/net/batman-advanced/files/etc/init.d/batman-adv-kernelland
+++ b/net/batman-advanced/files/etc/init.d/batman-adv-kernelland
@@ -8,25 +8,22 @@ start () {
 		exit
 	fi
 	
-	for interface in $interfaces
-	   do
-	      echo $interface > /proc/net/batman-adv/interfaces
-	   done
-	   
+	batctl interface $interfaces
+	
 	originator_interval=$(uci get batman-adv-kernelland.general.originator_interval)
 	log_level=$(uci get batman-adv-kernelland.general.log_level)
 
 	if [ $originator_interval ]; then
-		echo $originator_interval > /proc/net/batman-adv/originator_interval
+		batctl interval $originator_interval
 	fi
 	
 	if [ $log_level ]; then
-		echo $log_level > /proc/net/batman-adv/log_level
+		batctl loglevel $log_level
 	fi
 }
 
 stop () {
-        echo "" > /proc/net/batman-adv/interfaces
+	batctl interface none
 }
 
         
-- 
2.30.2