bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[batman-adv] batctl replaces battool for testing / debugging / configuration

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@16662 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
marek 2009-07-03 15:17:39 +00:00
parent 8c3a0e94b4
commit d46da905fe
2 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
net/batman-advanced/Makefile
View File

@ -9,7 +9,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv PKG_NAME:=batman-adv
PKG_REV:=1289 PKG_REV:=1334
PKG_VERSION:=r$(PKG_REV) PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=1 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_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman-adv-kernelland
PKG_TOOL_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-battool-install PKG_TOOL_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-batctl-install
PKG_TOOL_BUILD_DIR:=$(PKG_BUILD_DIR)/battool PKG_TOOL_BUILD_DIR:=$(PKG_BUILD_DIR)/batctl
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
@ -33,17 +33,6 @@ define Package/batman-adv/Default
MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de> MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
endef 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 define KernelPackage/batman-adv-kernelland
$(call Package/batman-adv/Default) $(call Package/batman-adv/Default)
SUBMENU:=Network Support SUBMENU:=Network Support
@ -66,7 +55,7 @@ MAKE_BATADV_KERNELLAND_ARGS += \
LINUX_VERSION="$(LINUX_VERSION)" \ LINUX_VERSION="$(LINUX_VERSION)" \
REVISION="$(PKG_REV)" modules REVISION="$(PKG_REV)" modules
MAKE_BATTOOL_ARGS += \ MAKE_BATCTL_ARGS += \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
CCFLAGS="$(TARGET_CFLAGS)" \ CCFLAGS="$(TARGET_CFLAGS)" \
OFLAGS="$(TARGET_CFLAGS)" \ OFLAGS="$(TARGET_CFLAGS)" \
@ -76,7 +65,7 @@ MAKE_BATTOOL_ARGS += \
UNAME="Linux" \ UNAME="Linux" \
INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
STRIP="/bin/true" \ STRIP="/bin/true" \
battool install batctl install
define Build/Configure define Build/Configure
endef endef
@ -85,26 +74,21 @@ ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batman-adv-kernelland),)
BUILD_KMOD_ADV = $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATADV_KERNELLAND_ARGS) BUILD_KMOD_ADV = $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATADV_KERNELLAND_ARGS)
endif endif
ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_battool),) ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batman-adv-kernelland),)
BUILD_BATTOOL = $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_BATTOOL_ARGS) BUILD_BATCTL = $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_BATCTL_ARGS)
endif endif
define Build/Compile define Build/Compile
cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile
$(BUILD_KMOD_ADV) $(BUILD_KMOD_ADV)
$(BUILD_BATTOOL) $(BUILD_BATCTL)
endef endef
define KernelPackage/batman-adv-kernelland/install 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_BIN) ./files/etc/init.d/batman-adv-kernelland $(1)/etc/init.d
$(INSTALL_DATA) ./files/etc/config/batman-adv-kernelland $(1)/etc/config $(INSTALL_DATA) ./files/etc/config/batman-adv-kernelland $(1)/etc/config
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/batctl $(1)/usr/sbin/
endef 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)) $(eval $(call KernelPackage,batman-adv-kernelland))

11
net/batman-advanced/files/etc/init.d/batman-adv-kernelland
View File

@ -8,25 +8,22 @@ start () {
exit exit
fi fi
for interface in $interfaces batctl interface $interfaces
do
echo $interface > /proc/net/batman-adv/interfaces
done
originator_interval=$(uci get batman-adv-kernelland.general.originator_interval) originator_interval=$(uci get batman-adv-kernelland.general.originator_interval)
log_level=$(uci get batman-adv-kernelland.general.log_level) log_level=$(uci get batman-adv-kernelland.general.log_level)
if [ $originator_interval ]; then if [ $originator_interval ]; then
echo $originator_interval > /proc/net/batman-adv/originator_interval batctl interval $originator_interval
fi fi
if [ $log_level ]; then if [ $log_level ]; then
echo $log_level > /proc/net/batman-adv/log_level batctl loglevel $log_level
fi fi
} }
stop () { stop () {
echo "" > /proc/net/batman-adv/interfaces batctl interface none
} }