Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv

On branch : master

commit 144adaa6ca2b25959a402607fbf4606644ad6981 Author: Marek Lindner lindner_marek@yahoo.de Date: Thu Jan 5 15:16:24 2012 +0000

batman-adv-devel: add bla2/catwoman/dat branch for testing

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

144adaa6ca2b25959a402607fbf4606644ad6981 batman-adv-devel/Config.in | 26 ++++++++++++++++++++++++++ batman-adv-devel/Makefile | 11 ++++++----- 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 5518f8d..7239f34 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -11,3 +11,29 @@ config KMOD_BATMAN_ADV_DEVEL_BATCTL batctl is a more intuitive managment utility for B.A.T.M.A.N.-Advanced. It is an easier method for configuring batman-adv and provides some additional tools for debugging as well. + +choice + prompt "branch selection" + default KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER + help + Select the branch to be built (if unsure leave default value). + + config KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER + bool "master" + + config KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2 + bool "bridge loop avoidance" + + config KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN + bool "network encoding (alias catwoman)" + + config KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT + bool "distributed arp table" +endchoice + +config KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME + string + default "master" if KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER + default "bla2" if KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2 + default "catwoman" if KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN + default "dat" if KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 3538a7b..6289358 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,17 +10,18 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=batman-adv-devel

-PKG_BATMAN_REV:=486dc02b027ff118757c0cc530040a4e855f2e5a -PKG_BATCTL_REV:=5f3776affad426fc2c00be3fb04c1bc1158829c5 +PKG_BATMAN_REV:=b82b9b254c8a923fb2d65e2ca3eefc2e8b4429e7 +PKG_BATCTL_REV:=d9ee7eed3175992be75e2cb949c048bdddeb0769

+PKG_BATMAN_BRANCH:=$(subst ",,$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME)) PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) -PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz +PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_BRANCH)-$(PKG_BATMAN_SHORTREV).tar.gz PKG_BATMAN_DIR:=batman-adv-$(PKG_BATMAN_SHORTREV) PKG_BATCTL_SHORTREV:=$(shell echo $(PKG_BATCTL_REV) | cut -c1-7) PKG_BATCTL_FNAME:=batctl-devel-$(PKG_BATCTL_SHORTREV).tar.gz PKG_BATCTL_DIR:=batctl-$(PKG_BATCTL_SHORTREV)

-PKG_SOURCE_URL:=http://git.open-mesh.org/snapshot/$(PKG_BATMAN_VERSION) +PKG_SOURCE_URL:=http://git.open-mesh.org/snapshot/ PKG_SOURCE:=$(PKG_BATMAN_FNAME)

PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_BATMAN_DIR) @@ -59,7 +60,7 @@ MAKE_BATMAN_ADV_ARGS += \ PWD="$(PKG_BUILD_DIR)" \ LINUX_VERSION="$(LINUX_VERSION)" \ $(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),CONFIG_BATMAN_ADV_DEBUG=y) \ - REVISION="$(PKG_BATMAN_SHORTREV)" all + REVISION="$(PKG_BATMAN_BRANCH)-$(PKG_BATMAN_SHORTREV)" all

MAKE_BATCTL_ARGS += \ CFLAGS="$(TARGET_CFLAGS)" \