Update Batman to compat15

This is not compatible with the old Batman!

Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
Signed-off-by: Christian Dresel <fff@chrisi01.de>
Signed-off-by: Fabian Bläse <fabian@blaese.de>
Reviewed-by: Fabian Bläse <fabian@blaese.de>
This commit is contained in:
Christian Dresel 2017-10-05 15:37:41 +02:00 committed by Tim Niemeyer
parent f7de1eb04c
commit 60fecf6ea5
5 changed files with 69 additions and 3 deletions

View File

@ -26,7 +26,7 @@ OPENWRT=(openwrt
$PACKAGEREV)
OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
## Be careful: FFF uses COMPAT_VERSION 14 at the moment.
## Be careful: FFF uses COMPAT_VERSION 15 as default at the moment.
## See http://www.open-mesh.org/projects/batman-adv/wiki/Compatversion
GLUON=(gluon
https://github.com/freifunk-gluon/packages.git
@ -38,7 +38,7 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
ROUTING=(routing
https://git.lede-project.org/feed/routing.git
d11075cd40a88602bf4ba2b275f72100ddcb4767) # lede-17.01
ROUTING_PKGS="alfred"
ROUTING_PKGS="kmod-batman-adv batctl alfred"
FFF=(fff)
FFF_PKGS="-a"

View File

@ -0,0 +1,43 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-batman-adv
PKG_VERSION:=1
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-batman-adv
include $(INCLUDE_DIR)/package.mk
define Package/fff-batman-adv
SECTION:=base
CATEGORY:=Freifunk
TITLE:=Freifunk-Franken batman-adv
URL:=http://www.freifunk-franken.de
DEPENDS:=+kmod-batman-adv \
+@KMOD_BATMAN_ADV_BATMAN_V \
+@KMOD_BATMAN_ADV_NC \
+batctl
endef
define Package/fff-batman-adv/description
This is the batman-adv for the Freifunk Franken Firmware
It is used to configure batman-adv.
endef
define Build/Prepare
echo "all: " > $(PKG_BUILD_DIR)/Makefile
endef
define Build/Configure
# nothing
endef
define Build/Compile
# nothing
endef
define Package/fff-batman-adv/install
$(CP) ./files/* $(1)/
endef
$(eval $(call BuildPackage,fff-batman-adv))

View File

@ -0,0 +1,22 @@
#!/bin/sh
uci batch <<EOF
delete batman-adv.bat0
set batman-adv.bat0=mesh
set batman-adv.bat0.gw_mode='client'
set batman-adv.bat0.gw_sel_class='1'
set batman-adv.bat0.bridge_loop_avoidance='0'
set batman-adv.bat0.network_coding='0'
set batman-adv.bat0.aggregated_ogms='1'
set batman-adv.bat0.ap_isolation='0'
set batman-adv.bat0.bonding='0'
set batman-adv.bat0.fragmentation='1'
set batman-adv.bat0.orig_interval='1000'
set batman-adv.bat0.vis_mode='0'
set batman-adv.bat0.distributed_arp_table='1'
set batman-adv.bat0.hop_penalty='30'
EOF
uci commit
exit 0

View File

@ -0,0 +1 @@
*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw client

View File

@ -21,7 +21,7 @@ define Package/fff-base
+fff-nodewatcher \
+fff-web \
+fff-uradvd \
+fff-batman-adv-legacy \
+fff-batman-adv \
+fff-firewall \
+fff-support \
+fff-network \