<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Hallo,<div class=""><br class=""></div><div class="">sieht jetzt für mich soweit gut aus. Daher</div><div class="">Reviewed-by: Fabian Bläse <<a href="mailto:fabian@blaese.de" class="">fabian@blaese.de</a>></div><div class=""><br class=""></div><div class="">Man könnte das durchaus in einen eigenen Branch stecken. Bevor das hier applied wird, muss man sich auf jeden Fall noch Gedanken drüber machen, wie man das verteilt, so dass existierende Hoods nicht kaputt gehen.</div><div class=""><br class=""></div><div class="">Gruß</div><div class="">Fabian</div><div class=""><br class=""></div><div class=""><div><blockquote type="cite" class=""><div class="">On 3. Sep 2017, at 14:19, <a href="mailto:mail@adrianschmutzler.de" class="">mail@adrianschmutzler.de</a> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">Moin.<br class=""><br class="">Da das ja eine diskontinuierliche Änderung ist, hat schon mal jemand drüber<br class="">nachgedacht, das in einen eigenen Branch zu stecken? (War ja scheinbar beim<br class="">Übergang von 0.5.2 zu 201603xx auch so...?<br class=""><br class="">Grüße<br class=""><br class="">Adrian<br class=""><br class=""><blockquote type="cite" class="">-----Original Message-----<br class="">From: franken-dev [<a href="mailto:franken-dev-bounces@freifunk.net" class="">mailto:franken-dev-bounces@freifunk.net</a>] On Behalf<br class="">Of Christian Dresel<br class="">Sent: Samstag, 2. September 2017 19:17<br class="">To: <a href="mailto:franken-dev@freifunk.net" class="">franken-dev@freifunk.net</a><br class="">Cc: Jan Kraus <<a href="mailto:mayosemmel@gmail.com" class="">mayosemmel@gmail.com</a>><br class="">Subject: [PATCH v3 1/4] Update Batman to compat15<br class=""><br class="">This is not compatible with the old Batman!<br class=""><br class="">Signed-off-by: Jan Kraus <<a href="mailto:mayosemmel@gmail.com" class="">mayosemmel@gmail.com</a>><br class="">Signed-off-by: Christian Dresel <<a href="mailto:fff@chrisi01.de" class="">fff@chrisi01.de</a>><br class=""><br class="">Update in v2:<br class=""> - no File mode change<br class=""> - remove legacy commentary<br class=""><br class="">Update in v3:<br class=""> -don't delete the batman-adv-legacy packages<br class="">---<br class=""> buildscript | 4 +-<br class=""> src/packages/fff/fff-batman-adv/Makefile | 43<br class="">++++++++++++++++++++++<br class=""> .../files/etc/uci-defaults/93-fff-batman-adv | 22 +++++++++++<br class=""> .../files/usr/lib/micron.d/fff-batman-adv | 1 +<br class=""> src/packages/fff/fff/Makefile | 2 +-<br class=""> 5 files changed, 69 insertions(+), 3 deletions(-) create mode 100644<br class="">src/packages/fff/fff-batman-adv/Makefile<br class=""> create mode 100644 src/packages/fff/fff-batman-adv/files/etc/uci-<br class="">defaults/93-fff-batman-adv<br class=""> create mode 100644 src/packages/fff/fff-batman-<br class="">adv/files/usr/lib/micron.d/fff-batman-adv<br class=""><br class="">diff --git a/buildscript b/buildscript<br class="">index 06f88c3..e369bde 100755<br class="">--- a/buildscript<br class="">+++ b/buildscript<br class="">@@ -26,7 +26,7 @@ OPENWRT=(openwrt<br class=""> $PACKAGEREV)<br class=""> OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"<br class=""><br class="">-## Be careful: FFF uses COMPAT_VERSION 14 at the moment.<br class="">+## Be careful: FFF uses COMPAT_VERSION 15 as default at the moment.<br class=""> ## See <a href="http://www.open-mesh.org/projects/batman-" class="">http://www.open-mesh.org/projects/batman-</a><br class="">adv/wiki/Compatversion<br class=""> GLUON=(gluon<br class=""> <a href="https://github.com/freifunk-gluon/packages.git" class="">https://github.com/freifunk-gluon/packages.git</a><br class="">@@ -37,7 +37,7 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond<br class="">simple-tc uradvd"<br class=""> ROUTING=(routing<br class=""> <a href="https://github.com/openwrt-routing/packages.git" class="">https://github.com/openwrt-routing/packages.git</a><br class=""> dd36dd47bbd75defcb3c517cafe7a19ee425f0af) # lede-17.01 -<br class="">ROUTING_PKGS="alfred"<br class="">+ROUTING_PKGS="kmod-batman-adv alfred"<br class=""><br class=""> FFF=(fff)<br class=""> FFF_PKGS="-a"<br class="">diff --git a/src/packages/fff/fff-batman-adv/Makefile<br class=""></blockquote>b/src/packages/fff/fff-<br class=""><blockquote type="cite" class="">batman-adv/Makefile<br class="">new file mode 100644<br class="">index 0000000..3598097<br class="">--- /dev/null<br class="">+++ b/src/packages/fff/fff-batman-adv/Makefile<br class="">@@ -0,0 +1,43 @@<br class="">+include $(TOPDIR)/rules.mk<br class="">+<br class="">+PKG_NAME:=fff-batman-adv<br class="">+PKG_VERSION:=1<br class="">+PKG_RELEASE:=1<br class="">+<br class="">+PKG_BUILD_DIR:=$(BUILD_DIR)/fff-batman-adv<br class="">+<br class="">+include $(INCLUDE_DIR)/package.mk<br class="">+<br class="">+define Package/fff-batman-adv<br class="">+ SECTION:=base<br class="">+ CATEGORY:=Freifunk<br class="">+ TITLE:=Freifunk-Franken batman-adv<br class="">+ URL:=<a href="http://www.freifunk-franken.de" class="">http://www.freifunk-franken.de</a><br class="">+ DEPENDS:=+kmod-batman-adv \<br class="">+ +@KMOD_BATMAN_ADV_BATMAN_V \<br class="">+ +@KMOD_BATMAN_ADV_NC \<br class="">+ +batctl<br class="">+endef<br class="">+<br class="">+define Package/fff-batman-adv/description<br class="">+ This is the batman-adv for the Freifunk Franken Firmware<br class="">+ It is used to configure batman-adv.<br class="">+endef<br class="">+<br class="">+define Build/Prepare<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>echo "all: " > $(PKG_BUILD_DIR)/Makefile endef<br class="">+<br class="">+define Build/Configure<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span># nothing<br class="">+endef<br class="">+<br class="">+define Build/Compile<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span># nothing<br class="">+endef<br class="">+<br class="">+define Package/fff-batman-adv/install<br class="">+<span class="Apple-tab-span" style="white-space:pre"> </span>$(CP) ./files/* $(1)/<br class="">+endef<br class="">+<br class="">+$(eval $(call BuildPackage,fff-batman-adv))<br class="">diff --git<br class=""></blockquote>a/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-<br class=""><blockquote type="cite" class="">batman-adv<br class=""></blockquote>b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-<br class=""><blockquote type="cite" class="">batman-adv<br class="">new file mode 100644<br class="">index 0000000..9bc3928<br class="">--- /dev/null<br class="">+++ b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batm<br class="">+++ an-adv<br class="">@@ -0,0 +1,22 @@<br class="">+#!/bin/sh<br class="">+<br class="">+uci batch <<EOF<br class="">+ delete batman-adv.bat0<br class="">+ set batman-adv.bat0=mesh<br class="">+ set batman-adv.bat0.gw_mode='client'<br class="">+ set batman-adv.bat0.gw_sel_class='1'<br class="">+ set batman-adv.bat0.bridge_loop_avoidance='0'<br class="">+ set batman-adv.bat0.network_coding='0'<br class="">+ set batman-adv.bat0.aggregated_ogms='1'<br class="">+ set batman-adv.bat0.ap_isolation='0'<br class="">+ set batman-adv.bat0.bonding='0'<br class="">+ set batman-adv.bat0.fragmentation='1'<br class="">+ set batman-adv.bat0.orig_interval='1000'<br class="">+ set batman-adv.bat0.vis_mode='0'<br class="">+ set batman-adv.bat0.distributed_arp_table='1'<br class="">+ set batman-adv.bat0.hop_penalty='30'<br class="">+EOF<br class="">+<br class="">+uci commit<br class="">+<br class="">+exit 0<br class="">diff --git a/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-<br class="">batman-adv b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-<br class="">batman-adv<br class="">new file mode 100644<br class="">index 0000000..21c857b<br class="">--- /dev/null<br class="">+++ b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-batman-<br class="">+++ adv<br class="">@@ -0,0 +1 @@<br class="">+*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw<br class="">+client<br class="">diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile<br class="">index b039c2d..1889818 100644<br class="">--- a/src/packages/fff/fff/Makefile<br class="">+++ b/src/packages/fff/fff/Makefile<br class="">@@ -21,7 +21,7 @@ define Package/fff-base<br class=""> +fff-nodewatcher \<br class=""> +fff-web \<br class=""> +fff-uradvd \<br class="">- +fff-batman-adv-legacy \<br class="">+ +fff-batman-adv \<br class=""> +fff-firewall \<br class=""> +fff-support \<br class=""> +fff-network \<br class="">--<br class="">2.1.4<br class=""><br class="">--<br class="">franken-dev mailing list<br class=""><a href="mailto:franken-dev@freifunk.net" class="">franken-dev@freifunk.net</a><br class="">http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net<br class=""></blockquote><br class="">-- <br class="">franken-dev mailing list<br class=""><a href="mailto:franken-dev@freifunk.net" class="">franken-dev@freifunk.net</a><br class="">http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net<br class=""></div></div></blockquote></div><br class=""></div></body></html>