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

On branch : master

commit d6dd73e412d41b420587be255780a02f5c5bc05c Author: Marek Lindner mareklindner@neomailbox.ch Date: Fri Jul 17 18:42:44 2015 +0800

batman-adv-devel: update to latest master and add support for BATMAN V

Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

d6dd73e412d41b420587be255780a02f5c5bc05c batman-adv-devel/Config.in | 7 ++++++- batman-adv-devel/Makefile | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 9101d36..f648962 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -24,11 +24,16 @@ config KMOD_BATMAN_ADV_DEVEL_NC depends on PACKAGE_kmod-batman-adv-devel default n

+config KMOD_BATMAN_ADV_DEVEL_BATMAN_V + bool "enable batman v routing algorithm" + depends on PACKAGE_kmod-batman-adv-devel + default n + config KMOD_BATMAN_ADV_DEVEL_BATMAN_REV string prompt "batman-adv git revision to build package with" depends on PACKAGE_kmod-batman-adv-devel - default "c7cc2d4" + default "7da6fe1d" help Enter the full or shortened git revision to override package default value. This allows to build from non-master branches diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 34f4ba7..bb234b2 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -28,8 +28,10 @@ define KernelPackage/batman-adv-devel MAINTAINER:=Marek Lindner mareklindner@neomailbox.ch SUBMENU:=Network Support DEPENDS:=+KMOD_BATMAN_ADV_DEVEL_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c + KCONFIG:=\ + CONFIG_AVERAGE=y TITLE:=B.A.T.M.A.N. Adv devel - FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) endef

@@ -60,12 +62,13 @@ MAKE_BATMAN_ADV_ARGS += \ CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DAT),y,n) \ CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_MCAST),y,n) \ CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_NC),y,n) \ + CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATMAN_V),y,n) \ REVISION="$(PKG_BATMAN_SHORTREV)" all

define Build/Prepare $(call Build/Prepare/Default) $(SED) '/#define _NET_BATMAN_ADV_MAIN_H_/a#undef CONFIG_MODULE_STRIPPED' \ - $(PKG_BUILD_DIR)/main.h + $(PKG_BUILD_DIR)/net/batman-adv/main.h endef

define Build/Compile