[v3,1/4] Update Batman to compat15

Message ID	1504372613-631-1-git-send-email-fff@chrisi01.de
State	Superseded
Headers	show Return-Path: <franken-dev-bounces@freifunk.net> From: Christian Dresel <fff@chrisi01.de> To: franken-dev@freifunk.net Subject: [PATCH v3 1/4] Update Batman to compat15 Date: Sat, 2 Sep 2017 19:16:53 +0200 Message-Id: <1504372613-631-1-git-send-email-fff@chrisi01.de> Cc: Jan Kraus <mayosemmel@gmail.com> Precedence: list Reply-To: Christian Dresel <fff@chrisi01.de>, franken-dev@freifunk.net MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: franken-dev-bounces@freifunk.net Sender: "franken-dev" <franken-dev-bounces@freifunk.net>

Christian Dresel Sept. 2, 2017, 5:16 p.m.

This is not compatible with the old Batman!

Signed-off-by: Jan Kraus <mayosemmel@gmail.com>
Signed-off-by: Christian Dresel <fff@chrisi01.de>

Update in v2:
 - no File mode change
 - remove legacy commentary

Update in v3:
 -don't delete the batman-adv-legacy packages
---
 buildscript                                        |  4 +-
 src/packages/fff/fff-batman-adv/Makefile           | 43 ++++++++++++++++++++++
 .../files/etc/uci-defaults/93-fff-batman-adv       | 22 +++++++++++
 .../files/usr/lib/micron.d/fff-batman-adv          |  1 +
 src/packages/fff/fff/Makefile                      |  2 +-
 5 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 src/packages/fff/fff-batman-adv/Makefile
 create mode 100644 src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv
 create mode 100644 src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-batman-adv

Adrian Schmutzler Sept. 3, 2017, 12:19 p.m.

Moin.

Da das ja eine diskontinuierliche Änderung ist, hat schon mal jemand drüber
nachgedacht, das in einen eigenen Branch zu stecken? (War ja scheinbar beim
Übergang von 0.5.2 zu 201603xx auch so...?

Grüße

Adrian

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf
> Of Christian Dresel
> Sent: Samstag, 2. September 2017 19:17
> To: franken-dev@freifunk.net
> Cc: Jan Kraus <mayosemmel@gmail.com>
> Subject: [PATCH v3 1/4] 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>
> 
> Update in v2:
>  - no File mode change
>  - remove legacy commentary
> 
> Update in v3:
>  -don't delete the batman-adv-legacy packages
> ---
>  buildscript                                        |  4 +-
>  src/packages/fff/fff-batman-adv/Makefile           | 43
> ++++++++++++++++++++++
>  .../files/etc/uci-defaults/93-fff-batman-adv       | 22 +++++++++++
>  .../files/usr/lib/micron.d/fff-batman-adv          |  1 +
>  src/packages/fff/fff/Makefile                      |  2 +-
>  5 files changed, 69 insertions(+), 3 deletions(-)  create mode 100644
> src/packages/fff/fff-batman-adv/Makefile
>  create mode 100644 src/packages/fff/fff-batman-adv/files/etc/uci-
> defaults/93-fff-batman-adv
>  create mode 100644 src/packages/fff/fff-batman-
> adv/files/usr/lib/micron.d/fff-batman-adv
> 
> diff --git a/buildscript b/buildscript
> index 06f88c3..e369bde 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -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
> @@ -37,7 +37,7 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond
> simple-tc uradvd"
>  ROUTING=(routing
>           https://github.com/openwrt-routing/packages.git
>           dd36dd47bbd75defcb3c517cafe7a19ee425f0af) # lede-17.01 -
> ROUTING_PKGS="alfred"
> +ROUTING_PKGS="kmod-batman-adv alfred"
> 
>  FFF=(fff)
>  FFF_PKGS="-a"
> diff --git a/src/packages/fff/fff-batman-adv/Makefile
b/src/packages/fff/fff-
> batman-adv/Makefile
> new file mode 100644
> index 0000000..3598097
> --- /dev/null
> +++ b/src/packages/fff/fff-batman-adv/Makefile
> @@ -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))
> diff --git
a/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-
> batman-adv
b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-
> batman-adv
> new file mode 100644
> index 0000000..9bc3928
> --- /dev/null
> +++ b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batm
> +++ an-adv
> @@ -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
> diff --git a/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-
> batman-adv b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-
> batman-adv
> new file mode 100644
> index 0000000..21c857b
> --- /dev/null
> +++ b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-batman-
> +++ adv
> @@ -0,0 +1 @@
> +*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw
> +client
> diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
> index b039c2d..1889818 100644
> --- a/src/packages/fff/fff/Makefile
> +++ b/src/packages/fff/fff/Makefile
> @@ -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 \
> --
> 2.1.4
> 
> --
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net

Fabian Blaese Sept. 6, 2017, 9:29 a.m.

Hallo,

sieht jetzt für mich soweit gut aus. Daher
Reviewed-by: Fabian Bläse <fabian@blaese.de <mailto:fabian@blaese.de>>

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.

Gruß
Fabian

> On 3. Sep 2017, at 14:19, mail@adrianschmutzler.de wrote:
> 
> Moin.
> 
> Da das ja eine diskontinuierliche Änderung ist, hat schon mal jemand drüber
> nachgedacht, das in einen eigenen Branch zu stecken? (War ja scheinbar beim
> Übergang von 0.5.2 zu 201603xx auch so...?
> 
> Grüße
> 
> Adrian
> 
>> -----Original Message-----
>> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf
>> Of Christian Dresel
>> Sent: Samstag, 2. September 2017 19:17
>> To: franken-dev@freifunk.net
>> Cc: Jan Kraus <mayosemmel@gmail.com>
>> Subject: [PATCH v3 1/4] 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>
>> 
>> Update in v2:
>> - no File mode change
>> - remove legacy commentary
>> 
>> Update in v3:
>> -don't delete the batman-adv-legacy packages
>> ---
>> buildscript                                        |  4 +-
>> src/packages/fff/fff-batman-adv/Makefile           | 43
>> ++++++++++++++++++++++
>> .../files/etc/uci-defaults/93-fff-batman-adv       | 22 +++++++++++
>> .../files/usr/lib/micron.d/fff-batman-adv          |  1 +
>> src/packages/fff/fff/Makefile                      |  2 +-
>> 5 files changed, 69 insertions(+), 3 deletions(-)  create mode 100644
>> src/packages/fff/fff-batman-adv/Makefile
>> create mode 100644 src/packages/fff/fff-batman-adv/files/etc/uci-
>> defaults/93-fff-batman-adv
>> create mode 100644 src/packages/fff/fff-batman-
>> adv/files/usr/lib/micron.d/fff-batman-adv
>> 
>> diff --git a/buildscript b/buildscript
>> index 06f88c3..e369bde 100755
>> --- a/buildscript
>> +++ b/buildscript
>> @@ -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
>> @@ -37,7 +37,7 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond
>> simple-tc uradvd"
>> ROUTING=(routing
>>          https://github.com/openwrt-routing/packages.git
>>          dd36dd47bbd75defcb3c517cafe7a19ee425f0af) # lede-17.01 -
>> ROUTING_PKGS="alfred"
>> +ROUTING_PKGS="kmod-batman-adv alfred"
>> 
>> FFF=(fff)
>> FFF_PKGS="-a"
>> diff --git a/src/packages/fff/fff-batman-adv/Makefile
> b/src/packages/fff/fff-
>> batman-adv/Makefile
>> new file mode 100644
>> index 0000000..3598097
>> --- /dev/null
>> +++ b/src/packages/fff/fff-batman-adv/Makefile
>> @@ -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))
>> diff --git
> a/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-
>> batman-adv
> b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-
>> batman-adv
>> new file mode 100644
>> index 0000000..9bc3928
>> --- /dev/null
>> +++ b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batm
>> +++ an-adv
>> @@ -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
>> diff --git a/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-
>> batman-adv b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-
>> batman-adv
>> new file mode 100644
>> index 0000000..21c857b
>> --- /dev/null
>> +++ b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-batman-
>> +++ adv
>> @@ -0,0 +1 @@
>> +*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw
>> +client
>> diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
>> index b039c2d..1889818 100644
>> --- a/src/packages/fff/fff/Makefile
>> +++ b/src/packages/fff/fff/Makefile
>> @@ -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 \
>> --
>> 2.1.4
>> 
>> --
>> franken-dev mailing list
>> franken-dev@freifunk.net
>> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
> 
> --
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net

Tim Niemeyer Sept. 12, 2017, 4:52 p.m.

Hi

Am 3. September 2017 14:19:56 MESZ schrieb mail@adrianschmutzler.de:
>Moin.
>
>Da das ja eine diskontinuierliche Änderung ist, hat schon mal jemand
>drüber
>nachgedacht, das in einen eigenen Branch zu stecken? (War ja scheinbar
>beim
>Übergang von 0.5.2 zu 201603xx auch so...?

Ich glaube das war nur ein Versuch eines stable branches.

Ich würde einen neuen Branch mit dem alten Kram nur anlegen, wenn wir ihn brauchen.

Tim


>
>Grüße
>
>Adrian
>
>> -----Original Message-----
>> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf
>> Of Christian Dresel
>> Sent: Samstag, 2. September 2017 19:17
>> To: franken-dev@freifunk.net
>> Cc: Jan Kraus <mayosemmel@gmail.com>
>> Subject: [PATCH v3 1/4] 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>
>> 
>> Update in v2:
>>  - no File mode change
>>  - remove legacy commentary
>> 
>> Update in v3:
>>  -don't delete the batman-adv-legacy packages
>> ---
>>  buildscript                                        |  4 +-
>>  src/packages/fff/fff-batman-adv/Makefile           | 43
>> ++++++++++++++++++++++
>>  .../files/etc/uci-defaults/93-fff-batman-adv       | 22 +++++++++++
>>  .../files/usr/lib/micron.d/fff-batman-adv          |  1 +
>>  src/packages/fff/fff/Makefile                      |  2 +-
>>  5 files changed, 69 insertions(+), 3 deletions(-)  create mode
>100644
>> src/packages/fff/fff-batman-adv/Makefile
>>  create mode 100644 src/packages/fff/fff-batman-adv/files/etc/uci-
>> defaults/93-fff-batman-adv
>>  create mode 100644 src/packages/fff/fff-batman-
>> adv/files/usr/lib/micron.d/fff-batman-adv
>> 
>> diff --git a/buildscript b/buildscript
>> index 06f88c3..e369bde 100755
>> --- a/buildscript
>> +++ b/buildscript
>> @@ -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
>> @@ -37,7 +37,7 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond
>> simple-tc uradvd"
>>  ROUTING=(routing
>>           https://github.com/openwrt-routing/packages.git
>>           dd36dd47bbd75defcb3c517cafe7a19ee425f0af) # lede-17.01 -
>> ROUTING_PKGS="alfred"
>> +ROUTING_PKGS="kmod-batman-adv alfred"
>> 
>>  FFF=(fff)
>>  FFF_PKGS="-a"
>> diff --git a/src/packages/fff/fff-batman-adv/Makefile
>b/src/packages/fff/fff-
>> batman-adv/Makefile
>> new file mode 100644
>> index 0000000..3598097
>> --- /dev/null
>> +++ b/src/packages/fff/fff-batman-adv/Makefile
>> @@ -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))
>> diff --git
>a/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-
>> batman-adv
>b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-
>> batman-adv
>> new file mode 100644
>> index 0000000..9bc3928
>> --- /dev/null
>> +++
>b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batm
>> +++ an-adv
>> @@ -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
>> diff --git
>a/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-
>> batman-adv
>b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-
>> batman-adv
>> new file mode 100644
>> index 0000000..21c857b
>> --- /dev/null
>> +++
>b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-batman-
>> +++ adv
>> @@ -0,0 +1 @@
>> +*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw
>> +client
>> diff --git a/src/packages/fff/fff/Makefile
>b/src/packages/fff/fff/Makefile
>> index b039c2d..1889818 100644
>> --- a/src/packages/fff/fff/Makefile
>> +++ b/src/packages/fff/fff/Makefile
>> @@ -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 \
>> --
>> 2.1.4
>> 
>> --
>> franken-dev mailing list
>> franken-dev@freifunk.net
>> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net

Tim Niemeyer Sept. 12, 2017, 4:54 p.m.

Hi

Am 6. September 2017 11:29:34 MESZ schrieb "Fabian Bläse" <fabian@blaese.de>:
>Hallo,
>
>sieht jetzt für mich soweit gut aus. Daher
>Reviewed-by: Fabian Bläse <fabian@blaese.de <mailto:fabian@blaese.de>>
>
>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.

Der ursprüngliche Plan war mit dem dezentralen Key x Change komplett neue Hoods anzulegen. Die wären dann von den alten getrennt. Die neue Hood würde man immer mal wieder splitten, die alten Stück für Stück mergen. Wie jetzt aktuell der Plan ist weiss ich nicht.

Tim

>
>Gruß
>Fabian
>
>> On 3. Sep 2017, at 14:19, mail@adrianschmutzler.de wrote:
>> 
>> Moin.
>> 
>> Da das ja eine diskontinuierliche Änderung ist, hat schon mal jemand
>drüber
>> nachgedacht, das in einen eigenen Branch zu stecken? (War ja
>scheinbar beim
>> Übergang von 0.5.2 zu 201603xx auch so...?
>> 
>> Grüße
>> 
>> Adrian
>> 
>>> -----Original Message-----
>>> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On
>Behalf
>>> Of Christian Dresel
>>> Sent: Samstag, 2. September 2017 19:17
>>> To: franken-dev@freifunk.net
>>> Cc: Jan Kraus <mayosemmel@gmail.com>
>>> Subject: [PATCH v3 1/4] 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>
>>> 
>>> Update in v2:
>>> - no File mode change
>>> - remove legacy commentary
>>> 
>>> Update in v3:
>>> -don't delete the batman-adv-legacy packages
>>> ---
>>> buildscript                                        |  4 +-
>>> src/packages/fff/fff-batman-adv/Makefile           | 43
>>> ++++++++++++++++++++++
>>> .../files/etc/uci-defaults/93-fff-batman-adv       | 22 +++++++++++
>>> .../files/usr/lib/micron.d/fff-batman-adv          |  1 +
>>> src/packages/fff/fff/Makefile                      |  2 +-
>>> 5 files changed, 69 insertions(+), 3 deletions(-)  create mode
>100644
>>> src/packages/fff/fff-batman-adv/Makefile
>>> create mode 100644 src/packages/fff/fff-batman-adv/files/etc/uci-
>>> defaults/93-fff-batman-adv
>>> create mode 100644 src/packages/fff/fff-batman-
>>> adv/files/usr/lib/micron.d/fff-batman-adv
>>> 
>>> diff --git a/buildscript b/buildscript
>>> index 06f88c3..e369bde 100755
>>> --- a/buildscript
>>> +++ b/buildscript
>>> @@ -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
>>> @@ -37,7 +37,7 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond
>>> simple-tc uradvd"
>>> ROUTING=(routing
>>>          https://github.com/openwrt-routing/packages.git
>>>          dd36dd47bbd75defcb3c517cafe7a19ee425f0af) # lede-17.01 -
>>> ROUTING_PKGS="alfred"
>>> +ROUTING_PKGS="kmod-batman-adv alfred"
>>> 
>>> FFF=(fff)
>>> FFF_PKGS="-a"
>>> diff --git a/src/packages/fff/fff-batman-adv/Makefile
>> b/src/packages/fff/fff-
>>> batman-adv/Makefile
>>> new file mode 100644
>>> index 0000000..3598097
>>> --- /dev/null
>>> +++ b/src/packages/fff/fff-batman-adv/Makefile
>>> @@ -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))
>>> diff --git
>> a/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-
>>> batman-adv
>> b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-
>>> batman-adv
>>> new file mode 100644
>>> index 0000000..9bc3928
>>> --- /dev/null
>>> +++
>b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batm
>>> +++ an-adv
>>> @@ -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
>>> diff --git
>a/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-
>>> batman-adv
>b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-
>>> batman-adv
>>> new file mode 100644
>>> index 0000000..21c857b
>>> --- /dev/null
>>> +++
>b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-batman-
>>> +++ adv
>>> @@ -0,0 +1 @@
>>> +*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw
>>> +client
>>> diff --git a/src/packages/fff/fff/Makefile
>b/src/packages/fff/fff/Makefile
>>> index b039c2d..1889818 100644
>>> --- a/src/packages/fff/fff/Makefile
>>> +++ b/src/packages/fff/fff/Makefile
>>> @@ -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 \
>>> --
>>> 2.1.4
>>> 
>>> --
>>> franken-dev mailing list
>>> franken-dev@freifunk.net
>>> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
>> 
>> --
>> franken-dev mailing list
>> franken-dev@freifunk.net
>> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net

Christian Dresel Sept. 12, 2017, 5:55 p.m.

hi

On 12.09.2017 18:54, Tim Niemeyer wrote:
> Hi
> 
> Am 6. September 2017 11:29:34 MESZ schrieb "Fabian Bläse" <fabian@blaese.de>:
>> Hallo,
>>
>> sieht jetzt für mich soweit gut aus. Daher
>> Reviewed-by: Fabian Bläse <fabian@blaese.de <mailto:fabian@blaese.de>>
>>
>> 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.
> 
> Der ursprüngliche Plan war mit dem dezentralen Key x Change komplett neue Hoods anzulegen. Die wären dann von den alten getrennt. Die neue Hood würde man immer mal wieder splitten, die alten Stück für Stück mergen. Wie jetzt aktuell der Plan ist weiss ich nicht.

Vom Grundprinzip genauso.

mfg

Christian

> 
> Tim
> 
>>
>> Gruß
>> Fabian
>>
>>> On 3. Sep 2017, at 14:19, mail@adrianschmutzler.de wrote:
>>>
>>> Moin.
>>>
>>> Da das ja eine diskontinuierliche Änderung ist, hat schon mal jemand
>> drüber
>>> nachgedacht, das in einen eigenen Branch zu stecken? (War ja
>> scheinbar beim
>>> Übergang von 0.5.2 zu 201603xx auch so...?
>>>
>>> Grüße
>>>
>>> Adrian
>>>
>>>> -----Original Message-----
>>>> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On
>> Behalf
>>>> Of Christian Dresel
>>>> Sent: Samstag, 2. September 2017 19:17
>>>> To: franken-dev@freifunk.net
>>>> Cc: Jan Kraus <mayosemmel@gmail.com>
>>>> Subject: [PATCH v3 1/4] 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>
>>>>
>>>> Update in v2:
>>>> - no File mode change
>>>> - remove legacy commentary
>>>>
>>>> Update in v3:
>>>> -don't delete the batman-adv-legacy packages
>>>> ---
>>>> buildscript                                        |  4 +-
>>>> src/packages/fff/fff-batman-adv/Makefile           | 43
>>>> ++++++++++++++++++++++
>>>> .../files/etc/uci-defaults/93-fff-batman-adv       | 22 +++++++++++
>>>> .../files/usr/lib/micron.d/fff-batman-adv          |  1 +
>>>> src/packages/fff/fff/Makefile                      |  2 +-
>>>> 5 files changed, 69 insertions(+), 3 deletions(-)  create mode
>> 100644
>>>> src/packages/fff/fff-batman-adv/Makefile
>>>> create mode 100644 src/packages/fff/fff-batman-adv/files/etc/uci-
>>>> defaults/93-fff-batman-adv
>>>> create mode 100644 src/packages/fff/fff-batman-
>>>> adv/files/usr/lib/micron.d/fff-batman-adv
>>>>
>>>> diff --git a/buildscript b/buildscript
>>>> index 06f88c3..e369bde 100755
>>>> --- a/buildscript
>>>> +++ b/buildscript
>>>> @@ -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
>>>> @@ -37,7 +37,7 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond
>>>> simple-tc uradvd"
>>>> ROUTING=(routing
>>>>          https://github.com/openwrt-routing/packages.git
>>>>          dd36dd47bbd75defcb3c517cafe7a19ee425f0af) # lede-17.01 -
>>>> ROUTING_PKGS="alfred"
>>>> +ROUTING_PKGS="kmod-batman-adv alfred"
>>>>
>>>> FFF=(fff)
>>>> FFF_PKGS="-a"
>>>> diff --git a/src/packages/fff/fff-batman-adv/Makefile
>>> b/src/packages/fff/fff-
>>>> batman-adv/Makefile
>>>> new file mode 100644
>>>> index 0000000..3598097
>>>> --- /dev/null
>>>> +++ b/src/packages/fff/fff-batman-adv/Makefile
>>>> @@ -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))
>>>> diff --git
>>> a/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-
>>>> batman-adv
>>> b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-
>>>> batman-adv
>>>> new file mode 100644
>>>> index 0000000..9bc3928
>>>> --- /dev/null
>>>> +++
>> b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batm
>>>> +++ an-adv
>>>> @@ -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
>>>> diff --git
>> a/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-
>>>> batman-adv
>> b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-
>>>> batman-adv
>>>> new file mode 100644
>>>> index 0000000..21c857b
>>>> --- /dev/null
>>>> +++
>> b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-batman-
>>>> +++ adv
>>>> @@ -0,0 +1 @@
>>>> +*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw
>>>> +client
>>>> diff --git a/src/packages/fff/fff/Makefile
>> b/src/packages/fff/fff/Makefile
>>>> index b039c2d..1889818 100644
>>>> --- a/src/packages/fff/fff/Makefile
>>>> +++ b/src/packages/fff/fff/Makefile
>>>> @@ -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 \
>>>> --
>>>> 2.1.4
>>>>
>>>> --
>>>> franken-dev mailing list
>>>> franken-dev@freifunk.net
>>>> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
>>>
>>> --
>>> franken-dev mailing list
>>> franken-dev@freifunk.net
>>> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net

Fabian Blaese Sept. 12, 2017, 8:51 p.m.

Ok, ich war da wohl nicht mehr ganz up to date. Ich bin davon ausgegangen, dass der keyxchangev2 abwärtskompatibel ist. Wenn man das aber eh alles neu aufziehen muss, dann stellt das ja weiter kein Problem dar, dann kann man sich einen extra Branch für altes batman eigentlich auch sparen.

Fabian

> On 12. Sep 2017, at 19:55, Christian Dresel <fff@chrisi01.de> wrote:
> 
> hi
> 
> On 12.09.2017 18:54, Tim Niemeyer wrote:
>> Hi
>> 
>> Am 6. September 2017 11:29:34 MESZ schrieb "Fabian Bläse" <fabian@blaese.de>:
>>> Hallo,
>>> 
>>> sieht jetzt für mich soweit gut aus. Daher
>>> Reviewed-by: Fabian Bläse <fabian@blaese.de <mailto:fabian@blaese.de>>
>>> 
>>> 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.
>> 
>> Der ursprüngliche Plan war mit dem dezentralen Key x Change komplett neue Hoods anzulegen. Die wären dann von den alten getrennt. Die neue Hood würde man immer mal wieder splitten, die alten Stück für Stück mergen. Wie jetzt aktuell der Plan ist weiss ich nicht.
> 
> Vom Grundprinzip genauso.
> 
> mfg
> 
> Christian
> 
>> 
>> Tim
>> 
>>> 
>>> Gruß
>>> Fabian
>>> 
>>>> On 3. Sep 2017, at 14:19, mail@adrianschmutzler.de wrote:
>>>> 
>>>> Moin.
>>>> 
>>>> Da das ja eine diskontinuierliche Änderung ist, hat schon mal jemand
>>> drüber
>>>> nachgedacht, das in einen eigenen Branch zu stecken? (War ja
>>> scheinbar beim
>>>> Übergang von 0.5.2 zu 201603xx auch so...?
>>>> 
>>>> Grüße
>>>> 
>>>> Adrian
>>>> 
>>>>> -----Original Message-----
>>>>> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On
>>> Behalf
>>>>> Of Christian Dresel
>>>>> Sent: Samstag, 2. September 2017 19:17
>>>>> To: franken-dev@freifunk.net
>>>>> Cc: Jan Kraus <mayosemmel@gmail.com>
>>>>> Subject: [PATCH v3 1/4] 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>
>>>>> 
>>>>> Update in v2:
>>>>> - no File mode change
>>>>> - remove legacy commentary
>>>>> 
>>>>> Update in v3:
>>>>> -don't delete the batman-adv-legacy packages
>>>>> ---
>>>>> buildscript                                        |  4 +-
>>>>> src/packages/fff/fff-batman-adv/Makefile           | 43
>>>>> ++++++++++++++++++++++
>>>>> .../files/etc/uci-defaults/93-fff-batman-adv       | 22 +++++++++++
>>>>> .../files/usr/lib/micron.d/fff-batman-adv          |  1 +
>>>>> src/packages/fff/fff/Makefile                      |  2 +-
>>>>> 5 files changed, 69 insertions(+), 3 deletions(-)  create mode
>>> 100644
>>>>> src/packages/fff/fff-batman-adv/Makefile
>>>>> create mode 100644 src/packages/fff/fff-batman-adv/files/etc/uci-
>>>>> defaults/93-fff-batman-adv
>>>>> create mode 100644 src/packages/fff/fff-batman-
>>>>> adv/files/usr/lib/micron.d/fff-batman-adv
>>>>> 
>>>>> diff --git a/buildscript b/buildscript
>>>>> index 06f88c3..e369bde 100755
>>>>> --- a/buildscript
>>>>> +++ b/buildscript
>>>>> @@ -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
>>>>> @@ -37,7 +37,7 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond
>>>>> simple-tc uradvd"
>>>>> ROUTING=(routing
>>>>>         https://github.com/openwrt-routing/packages.git
>>>>>         dd36dd47bbd75defcb3c517cafe7a19ee425f0af) # lede-17.01 -
>>>>> ROUTING_PKGS="alfred"
>>>>> +ROUTING_PKGS="kmod-batman-adv alfred"
>>>>> 
>>>>> FFF=(fff)
>>>>> FFF_PKGS="-a"
>>>>> diff --git a/src/packages/fff/fff-batman-adv/Makefile
>>>> b/src/packages/fff/fff-
>>>>> batman-adv/Makefile
>>>>> new file mode 100644
>>>>> index 0000000..3598097
>>>>> --- /dev/null
>>>>> +++ b/src/packages/fff/fff-batman-adv/Makefile
>>>>> @@ -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))
>>>>> diff --git
>>>> a/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-
>>>>> batman-adv
>>>> b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-
>>>>> batman-adv
>>>>> new file mode 100644
>>>>> index 0000000..9bc3928
>>>>> --- /dev/null
>>>>> +++
>>> b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batm
>>>>> +++ an-adv
>>>>> @@ -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
>>>>> diff --git
>>> a/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-
>>>>> batman-adv
>>> b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-
>>>>> batman-adv
>>>>> new file mode 100644
>>>>> index 0000000..21c857b
>>>>> --- /dev/null
>>>>> +++
>>> b/src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-batman-
>>>>> +++ adv
>>>>> @@ -0,0 +1 @@
>>>>> +*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw
>>>>> +client
>>>>> diff --git a/src/packages/fff/fff/Makefile
>>> b/src/packages/fff/fff/Makefile
>>>>> index b039c2d..1889818 100644
>>>>> --- a/src/packages/fff/fff/Makefile
>>>>> +++ b/src/packages/fff/fff/Makefile
>>>>> @@ -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 \
>>>>> --
>>>>> 2.1.4
>>>>> 
>>>>> --
>>>>> franken-dev mailing list
>>>>> franken-dev@freifunk.net
>>>>> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
>>>> 
>>>> --
>>>> franken-dev mailing list
>>>> franken-dev@freifunk.net
>>>> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
>

[v3,1/4] Update Batman to compat15

Details

Commit Message

Patch hide | download patch | download mbox

Comments