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

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@15917 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
marek 2009-05-18 17:49:15 +00:00
parent b3241e541c
commit 7156482835
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/batman-advanced/Makefile
View File

@ -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

8
net/batman/Makefile
View File

@ -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

2
net/batman/files/etc/config/batmand
View File

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

9
net/batman/files/etc/init.d/batmand
View File

@ -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' '