[PATCH v3 1/4] Update Batman to compat15
Fabian Bläse
fabian at blaese.de
Mi Sep 6 11:29:34 CEST 2017
Hallo,
sieht jetzt für mich soweit gut aus. Daher
Reviewed-by: Fabian Bläse <fabian at blaese.de <mailto:fabian at 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 at 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 at freifunk.net] On Behalf
>> Of Christian Dresel
>> Sent: Samstag, 2. September 2017 19:17
>> To: franken-dev at freifunk.net
>> Cc: Jan Kraus <mayosemmel at 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 at gmail.com>
>> Signed-off-by: Christian Dresel <fff at 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 \
>> + + at KMOD_BATMAN_ADV_BATMAN_V \
>> + + at 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 at freifunk.net
>> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
>
> --
> franken-dev mailing list
> franken-dev at freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
-------------- nächster Teil --------------
Ein Dateianhang mit HTML-Daten wurde abgetrennt...
URL: <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20170906/eed9af4f/attachment.html>
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname : signature.asc
Dateityp : application/pgp-signature
Dateigröße : 801 bytes
Beschreibung: Message signed with OpenPGP
URL : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20170906/eed9af4f/attachment.sig>
Mehr Informationen über die Mailingliste franken-dev