Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv
On branch : master
commit 2c0d9ea180814e490a6ad41cb07ed79c962ccf7e Author: Marek Lindner lindner_marek@yahoo.de Date: Mon Jul 30 22:18:40 2012 +0000
batman-adv-devel: make git revision configurable via make menuconfig
Signed-off-by: Marek Lindner lindner_marek@yahoo.de
2c0d9ea180814e490a6ad41cb07ed79c962ccf7e batman-adv-devel/Config.in | 46 ++++++++++++++++++-------------------------- batman-adv-devel/Makefile | 9 ++++----- 2 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index e1b70df..78bc5a7 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -12,32 +12,24 @@ config KMOD_BATMAN_ADV_DEVEL_BATCTL depends PACKAGE_kmod-batman-adv-devel default y help - 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. + 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_BATMANV - bool "batman V routing algorithm" - - 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_BATMAN_REV + string + prompt "batman-adv git revision to build package with" + default "3fdeaa6" + help + Enter the full or shortened git revision to override package + default value. This allows to build from non-master branches + to test unreleased features.
-config KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME - string - default "master" if KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER - default "batmanv" if KMOD_BATMAN_ADV_DEVEL_BRANCH_BATMANV - default "catwoman" if KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN - default "dat" if KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT +config KMOD_BATMAN_ADV_DEVEL_BATCTL_REV + string + prompt "batctl git revision to build package with" + default "acd06db" + help + Enter the full or shortened git revision to override package + default value. This allows to build from non-master branches + to test unreleased features. diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index a290369..db58b99 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,12 +10,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv-devel
-PKG_BATMAN_REV:=5deb69f60f388055982a1da6dce876049f86841d -PKG_BATCTL_REV:=b7b948479ca2c12ad4f038c974ee20294005ddf1 +PKG_BATMAN_REV:=$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATMAN_REV) +PKG_BATCTL_REV:=$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL_REV)
-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_BRANCH)-$(PKG_BATMAN_SHORTREV).tar.gz +PKG_BATMAN_FNAME:=batman-adv-devel-$(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 @@ -61,7 +60,7 @@ MAKE_BATMAN_ADV_ARGS += \ LINUX_VERSION="$(LINUX_VERSION)" \ CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),y,n) \ CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_BLA),y,n) \ - REVISION="$(PKG_BATMAN_BRANCH)-$(PKG_BATMAN_SHORTREV)" all + REVISION="$(PKG_BATMAN_SHORTREV)" all
MAKE_BATCTL_ARGS += \ CFLAGS="$(TARGET_CFLAGS)" \