batman: add kernelland init script & config file

SVN-Revision: 14803

diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile
index e404d8a4bebe9b553ee7bde7380be424b594cfaa..4c9ce8806d936499b6e8cd31c712891fa01b9dd3 100644 (file)
--- a/net/batman-advanced/Makefile
+++ b/net/batman-advanced/Makefile
@@ -30,11 +30,11 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 define Package/batman-adv/Default
-  URL:=https://www.open-mesh.net/
+  URL:=http://www.open-mesh.net/
   MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
 endef
 
-define Package/batmand-adv
+define Package/batmand-adv-userspace
 $(call Package/batman-adv/Default)
   SECTION:=net
   CATEGORY:=Network
@@ -42,7 +42,7 @@ $(call Package/batman-adv/Default)
   TITLE:=B.A.T.M.A.N. layer 2 routing daemon
 endef
 
-define Package/batmand-adv/description
+define Package/batmand-adv-userspace/description
 B.A.T.M.A.N. layer 2 routing daemon
 endef
 
@@ -57,7 +57,7 @@ define Package/battool/description
 B.A.T.M.A.N. layer 2 debug tools
 endef
 
-define KernelPackage/batman-advanced
+define KernelPackage/batman-adv-kernelland
 $(call Package/batman-adv/Default)
   SUBMENU:=Network Support
   DEPENDS:=@LINUX_2_6
@@ -67,7 +67,7 @@ $(call Package/batman-adv/Default)
 endef
 
 
-define KernelPackage/batman-advanced/description
+define KernelPackage/batman-adv-kernelland/description
 Kernel routing module for B.A.T.M.A.N. layer 2
 endef
 
@@ -106,11 +106,11 @@ MAKE_TOOL_ARGS += \
 define Build/Configure
 endef
 
-ifneq ($(CONFIG_PACKAGE_batmand-adv),n)
+ifneq ($(CONFIG_PACKAGE_batmand-adv-userspace),n)
        BUILD_ADV = $(MAKE) -C $(PKG_BUILD_DIR)/batman-adv-userspace $(MAKE_ARGS)
 endif
 
-ifneq ($(CONFIG_PACKAGE_kmod-batman-advanced),n)
+ifneq ($(CONFIG_PACKAGE_kmod-batman-adv-kernelland),n)
         BUILD_KMOD_ADV = $(MAKE) -C "$(LINUX_DIR)" $(MAKE_KMOD_ARGS)
 endif
 
@@ -125,11 +125,17 @@ define Build/Compile
        $(BUILD_BATTOOL)
 endef
 
-define Package/batmand-adv/install
+define Package/batmand-adv-userspace/install
        $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/batmand-adv $(1)/usr/sbin/
-       $(INSTALL_BIN) ./files/etc/init.d/batmand-adv $(1)/etc/init.d
-       $(INSTALL_DATA) ./files/etc/config/batmand-adv $(1)/etc/config
+       $(INSTALL_BIN) ./files/etc/init.d/batmand-adv-userspace $(1)/etc/init.d
+       $(INSTALL_DATA) ./files/etc/config/batmand-adv-userspace $(1)/etc/config
+endef
+
+define Package/batmand-adv-kernelland/install
+       $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/etc/init.d/batmand-adv-kernelland $(1)/etc/init.d
+       $(INSTALL_DATA) ./files/etc/config/batmand-adv-kernelland $(1)/etc/config
 endef
 
 define Package/battool/install
@@ -137,6 +143,6 @@ define Package/battool/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/battool $(1)/usr/sbin/
 endef
 
-$(eval $(call BuildPackage,batmand-adv))
+$(eval $(call BuildPackage,batmand-adv-userspace))
 $(eval $(call BuildPackage,battool))
-$(eval $(call KernelPackage,batman-advanced))
+$(eval $(call KernelPackage,batman-adv-kernelland))

diff --git a/net/batman-advanced/files/etc/config/batmand-adv b/net/batman-advanced/files/etc/config/batmand-adv
deleted file mode 100644 (file)
index 19c2c66..0000000
--- a/net/batman-advanced/files/etc/config/batmand-adv
+++ /dev/null
@@ -1,4 +0,0 @@
-config batmand-adv general
-       option interface                ath0
-       option originator_interval
-       option visualisation_srv        

diff --git a/net/batman-advanced/files/etc/config/batmand-adv-kernelland b/net/batman-advanced/files/etc/config/batmand-adv-kernelland
new file mode 100644 (file)
index 0000000..4ba0710
--- /dev/null
+++ b/net/batman-advanced/files/etc/config/batmand-adv-kernelland
@@ -0,0 +1,4 @@
+config batmand-adv-kernelland general
+       option interface                ath0
+       option originator_interval
+       option log_level        

diff --git a/net/batman-advanced/files/etc/config/batmand-adv-userspace b/net/batman-advanced/files/etc/config/batmand-adv-userspace
new file mode 100644 (file)
index 0000000..b077b77
--- /dev/null
+++ b/net/batman-advanced/files/etc/config/batmand-adv-userspace
@@ -0,0 +1,4 @@
+config batmand-adv-userspace general
+       option interface                ath0
+       option originator_interval
+       option visualisation_srv        

diff --git a/net/batman-advanced/files/etc/init.d/batmand-adv b/net/batman-advanced/files/etc/init.d/batmand-adv
deleted file mode 100644 (file)
index 9555346..0000000
--- a/net/batman-advanced/files/etc/init.d/batmand-adv
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=90
-. /lib/config/uci.sh
-uci_load batmand-adv
-start () {
-       interface=$(uci get batmand-adv.general.interface)
-       if [ "$interface" = "" ]; then
-               echo $1 Error, you must specify at least a network interface
-               exit
-       fi
-       originator_interval=$(uci get batmand-adv.general.originator_interval)
-       visualisation_srv=$(uci get batmand-adv.general.visualisation_srv)
-       batman_args=""
-
-       if [ $originator_interval ]; then
-               batman_args=${batman_args}'-o '$originator_interval' '
-       fi
-
-       if [ $visualisation_srv ]; then
-               batman_args=${batman_args}'-s '$visualisation_srv' '
-       fi
-
-       batman_args=${batman_args}$interface
-       batmand-adv $batman_args >/dev/null 2>&1
-}
-
-restart () {
-       $0 stop
-       sleep 3
-       $0 start
-}
-        
-stop () {
-       killall batmand-adv
-}

diff --git a/net/batman-advanced/files/etc/init.d/batmand-adv-kernelland b/net/batman-advanced/files/etc/init.d/batmand-adv-kernelland
new file mode 100644 (file)
index 0000000..b553841
--- /dev/null
+++ b/net/batman-advanced/files/etc/init.d/batmand-adv-kernelland
@@ -0,0 +1,37 @@
+#!/bin/sh /etc/rc.common
+START=90
+. /lib/config/uci.sh
+uci_load batmand-adv-kernelland
+start () {
+       interfaces=$(uci get batmand-adv-kernalland.general.interface)
+       if [ "$interface" = "" ]; then
+               echo $1 Error, you must specify at least a network interface
+               exit
+       fi
+       
+       for interface in interfaces
+          do
+             echo $interface > /proc/net/batman-adv/interfaces
+          done
+          
+       originator_interval=$(uci get batmand-adv-kernalland.general.originator_interval)
+       log_level=$(uci get batmand-adv-kernalland.general.log_level)
+
+       if [ $originator_interval ]; then
+               echo $originator_interval > /proc/net/batman-adv/originator_interval
+       fi
+       
+       if [ $log_level ]; then
+               echo $log_level > /proc/net/batman-adv/log_level
+       fi
+}
+
+restart () {
+       $0 stop
+       sleep 3
+       $0 start
+}
+        
+stop () {
+       echo "" > /proc/net/batman-adv/interfaces
+}

diff --git a/net/batman-advanced/files/etc/init.d/batmand-adv-userspace b/net/batman-advanced/files/etc/init.d/batmand-adv-userspace
new file mode 100644 (file)
index 0000000..9ea7e4f
--- /dev/null
+++ b/net/batman-advanced/files/etc/init.d/batmand-adv-userspace
@@ -0,0 +1,35 @@
+#!/bin/sh /etc/rc.common
+START=90
+. /lib/config/uci.sh
+uci_load batmand-adv-userspace
+start () {
+       interface=$(uci get batmand-adv-userspace.general.interface)
+       if [ "$interface" = "" ]; then
+               echo $1 Error, you must specify at least a network interface
+               exit
+       fi
+       originator_interval=$(uci get batmand-adv-userspace.general.originator_interval)
+       visualisation_srv=$(uci get batmand-adv-space.general.visualisation_srv)
+       batman_args=""
+
+       if [ $originator_interval ]; then
+               batman_args=${batman_args}'-o '$originator_interval' '
+       fi
+
+       if [ $visualisation_srv ]; then
+               batman_args=${batman_args}'-s '$visualisation_srv' '
+       fi
+
+       batman_args=${batman_args}$interface
+       batmand-adv $batman_args >/dev/null 2>&1
+}
+
+restart () {
+       $0 stop
+       sleep 3
+       $0 start
+}
+        
+stop () {
+       killall batmand-adv
+}

diff --git a/net/batman/Makefile b/net/batman/Makefile
index 668c888b0b397cf39a1830c51cf2fec043f83967..5d9ccbdacd3570ef1d65c7cbde2d3c99b460956a 100644 (file)
--- 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:=1206
+PKG_REV:=1235
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 #PKG_BRANCH:=batman-0.3