[v2,1/4] Update Batman to compat15

Submitted by Christian Dresel on Sept. 2, 2017, 1:42 p.m.

Details

Message ID 1504359756-26395-1-git-send-email-fff@chrisi01.de
State Superseded
Headers show

Commit Message

Christian Dresel Sept. 2, 2017, 1:42 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
---
 buildscript                                        |  7 ++--
 src/packages/fff/fff-batman-adv-legacy/Makefile    | 44 ----------------------
 .../files/etc/uci-defaults/93-fff-batman-adv       | 22 -----------
 .../files/usr/lib/micron.d/fff-batman-adv-legacy   |  1 -
 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 +-
 8 files changed, 70 insertions(+), 72 deletions(-)
 delete mode 100644 src/packages/fff/fff-batman-adv-legacy/Makefile
 delete mode 100644 src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-batman-adv
 delete mode 100644 src/packages/fff/fff-batman-adv-legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
 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

Patch hide | download patch | download mbox 

diff --git a/buildscript b/buildscript
index 06f88c3..775e58c 100755
--- a/buildscript
+++ b/buildscript
@@ -26,18 +26,16 @@  OPENWRT=(openwrt
          $PACKAGEREV)
 OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
 
-## Be careful: FFF uses COMPAT_VERSION 14 at the moment.
-## See http://www.open-mesh.org/projects/batman-adv/wiki/Compatversion
 GLUON=(gluon
             https://github.com/freifunk-gluon/packages.git
             a18c69094c534bb7359d9c95c7b88ac047712574)
-GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
+GLUON_PKGS="micrond simple-tc uradvd"
 
 #official openwrt routing packages
 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"
@@ -510,3 +508,4 @@  case "$1" in
         echo
     ;;
 esac
+
diff --git a/src/packages/fff/fff-batman-adv-legacy/Makefile b/src/packages/fff/fff-batman-adv-legacy/Makefile
deleted file mode 100644
index 48b9e50..0000000
--- a/src/packages/fff/fff-batman-adv-legacy/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@ 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fff-batman-adv-legacy
-PKG_VERSION:=1
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/fff-batman-adv-legacy
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fff-batman-adv-legacy
-    SECTION:=base
-    CATEGORY:=Freifunk
-    TITLE:=Freifunk-Franken batman-adv-legacy
-    URL:=http://www.freifunk-franken.de
-    DEPENDS:=+@PACKAGE_kmod-batman-adv-legacy \
-             +@KMOD_BATMAN_ADV_LEGACY_BLA \
-             +@KMOD_BATMAN_ADV_LEGACY_DAT \
-             +@KMOD_BATMAN_ADV_LEGACY_NC \
-             +@KMOD_BATMAN_ADV_LEGACY_BATCTL
-endef
-
-define Package/fff-batman-adv-legacy/description
-    This is the batman-adv-legacy for the Freifunk Franken Firmware
-    It is used to configure batman-adv-legacy.
-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-legacy/install
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,fff-batman-adv-legacy))
diff --git a/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-batman-adv b/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-batman-adv
deleted file mode 100644
index 9bc3928..0000000
--- a/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-defaults/93-fff-batman-adv
+++ /dev/null
@@ -1,22 +0,0 @@ 
-#!/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-legacy/files/usr/lib/micron.d/fff-batman-adv-legacy b/src/packages/fff/fff-batman-adv-legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
deleted file mode 100644
index 21c857b..0000000
--- a/src/packages/fff/fff-batman-adv-legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
+++ /dev/null
@@ -1 +0,0 @@ 
-*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw client
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-batman-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 \

Comments

Tim Niemeyer Sept. 2, 2017, 2:48 p.m. 
Am Samstag, den 02.09.2017, 15:42 +0200 schrieb Christian Dresel:
> 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
> ---
>  buildscript                                        |  7 ++--
>  src/packages/fff/fff-batman-adv-legacy/Makefile    | 44 ------------
Du solltest nicht das ganze Paket entfernen. Deaktivieren reicht.
Vielleicht möchte das noch jemand verwenden.

Tim

> ----------
>  .../files/etc/uci-defaults/93-fff-batman-adv       | 22 -----------
>  .../files/usr/lib/micron.d/fff-batman-adv-legacy   |  1 -
>  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 +-
>  8 files changed, 70 insertions(+), 72 deletions(-)
>  delete mode 100644 src/packages/fff/fff-batman-adv-legacy/Makefile
>  delete mode 100644 src/packages/fff/fff-batman-adv-
> legacy/files/etc/uci-defaults/93-fff-batman-adv
>  delete mode 100644 src/packages/fff/fff-batman-adv-
> legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
>  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..775e58c 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -26,18 +26,16 @@ OPENWRT=(openwrt
>           $PACKAGEREV)
>  OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
>  
> -## Be careful: FFF uses COMPAT_VERSION 14 at the moment.
> -## See http://www.open-mesh.org/projects/batman-adv/wiki/Compatversi
> on
>  GLUON=(gluon
>              https://github.com/freifunk-gluon/packages.git
>              a18c69094c534bb7359d9c95c7b88ac047712574)
> -GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
> +GLUON_PKGS="micrond simple-tc uradvd"
>  
>  #official openwrt routing packages
>  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"
> @@ -510,3 +508,4 @@ case "$1" in
>          echo
>      ;;
>  esac
> +
> diff --git a/src/packages/fff/fff-batman-adv-legacy/Makefile
> b/src/packages/fff/fff-batman-adv-legacy/Makefile
> deleted file mode 100644
> index 48b9e50..0000000
> --- a/src/packages/fff/fff-batman-adv-legacy/Makefile
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -include $(TOPDIR)/rules.mk
> -
> -PKG_NAME:=fff-batman-adv-legacy
> -PKG_VERSION:=1
> -PKG_RELEASE:=1
> -
> -PKG_BUILD_DIR:=$(BUILD_DIR)/fff-batman-adv-legacy
> -
> -include $(INCLUDE_DIR)/package.mk
> -
> -define Package/fff-batman-adv-legacy
> -    SECTION:=base
> -    CATEGORY:=Freifunk
> -    TITLE:=Freifunk-Franken batman-adv-legacy
> -    URL:=http://www.freifunk-franken.de
> -    DEPENDS:=+@PACKAGE_kmod-batman-adv-legacy \
> -             +@KMOD_BATMAN_ADV_LEGACY_BLA \
> -             +@KMOD_BATMAN_ADV_LEGACY_DAT \
> -             +@KMOD_BATMAN_ADV_LEGACY_NC \
> -             +@KMOD_BATMAN_ADV_LEGACY_BATCTL
> -endef
> -
> -define Package/fff-batman-adv-legacy/description
> -    This is the batman-adv-legacy for the Freifunk Franken Firmware
> -    It is used to configure batman-adv-legacy.
> -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-legacy/install
> -	$(CP) ./files/* $(1)/
> -endef
> -
> -$(eval $(call BuildPackage,fff-batman-adv-legacy))
> diff --git a/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-
> defaults/93-fff-batman-adv b/src/packages/fff/fff-batman-adv-
> legacy/files/etc/uci-defaults/93-fff-batman-adv
> deleted file mode 100644
> index 9bc3928..0000000
> --- a/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-
> defaults/93-fff-batman-adv
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -#!/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-
> legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
> b/src/packages/fff/fff-batman-adv-legacy/files/usr/lib/micron.d/fff-
> batman-adv-legacy
> deleted file mode 100644
> index 21c857b..0000000
> --- a/src/packages/fff/fff-batman-adv-
> legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
> +++ /dev/null
> @@ -1 +0,0 @@
> -*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw
> client
> 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-
> batman-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
>
Christian Dresel Sept. 2, 2017, 4:11 p.m. 
hi

On 02.09.2017 16:48, Tim Niemeyer wrote:
> Am Samstag, den 02.09.2017, 15:42 +0200 schrieb Christian Dresel:
>> 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
>> ---
>>  buildscript                                        |  7 ++--
>>  src/packages/fff/fff-batman-adv-legacy/Makefile    | 44 ------------
> Du solltest nicht das ganze Paket entfernen. Deaktivieren reicht.
> Vielleicht möchte das noch jemand verwenden.

Ich kann mir zwar kaum vorstellen, dass es dann noch jemand haben mag
aber wenn du es behalten willst, kann man auch einfach dieses Patch
hernehmen:

https://pw.freifunk-franken.de/patch/210/

da sollte es dann so drinnen sein. Meins ist nur darauf aufgebaut
(deshalb Jan Kraus auch als Signed-off-by: mit dabei) und eben das alte
gleich entfernt.

mfg

Christian

> 
> Tim
> 
>> ----------
>>  .../files/etc/uci-defaults/93-fff-batman-adv       | 22 -----------
>>  .../files/usr/lib/micron.d/fff-batman-adv-legacy   |  1 -
>>  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 +-
>>  8 files changed, 70 insertions(+), 72 deletions(-)
>>  delete mode 100644 src/packages/fff/fff-batman-adv-legacy/Makefile
>>  delete mode 100644 src/packages/fff/fff-batman-adv-
>> legacy/files/etc/uci-defaults/93-fff-batman-adv
>>  delete mode 100644 src/packages/fff/fff-batman-adv-
>> legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
>>  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..775e58c 100755
>> --- a/buildscript
>> +++ b/buildscript
>> @@ -26,18 +26,16 @@ OPENWRT=(openwrt
>>           $PACKAGEREV)
>>  OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
>>  
>> -## Be careful: FFF uses COMPAT_VERSION 14 at the moment.
>> -## See http://www.open-mesh.org/projects/batman-adv/wiki/Compatversi
>> on
>>  GLUON=(gluon
>>              https://github.com/freifunk-gluon/packages.git
>>              a18c69094c534bb7359d9c95c7b88ac047712574)
>> -GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
>> +GLUON_PKGS="micrond simple-tc uradvd"
>>  
>>  #official openwrt routing packages
>>  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"
>> @@ -510,3 +508,4 @@ case "$1" in
>>          echo
>>      ;;
>>  esac
>> +
>> diff --git a/src/packages/fff/fff-batman-adv-legacy/Makefile
>> b/src/packages/fff/fff-batman-adv-legacy/Makefile
>> deleted file mode 100644
>> index 48b9e50..0000000
>> --- a/src/packages/fff/fff-batman-adv-legacy/Makefile
>> +++ /dev/null
>> @@ -1,44 +0,0 @@
>> -include $(TOPDIR)/rules.mk
>> -
>> -PKG_NAME:=fff-batman-adv-legacy
>> -PKG_VERSION:=1
>> -PKG_RELEASE:=1
>> -
>> -PKG_BUILD_DIR:=$(BUILD_DIR)/fff-batman-adv-legacy
>> -
>> -include $(INCLUDE_DIR)/package.mk
>> -
>> -define Package/fff-batman-adv-legacy
>> -    SECTION:=base
>> -    CATEGORY:=Freifunk
>> -    TITLE:=Freifunk-Franken batman-adv-legacy
>> -    URL:=http://www.freifunk-franken.de
>> -    DEPENDS:=+@PACKAGE_kmod-batman-adv-legacy \
>> -             +@KMOD_BATMAN_ADV_LEGACY_BLA \
>> -             +@KMOD_BATMAN_ADV_LEGACY_DAT \
>> -             +@KMOD_BATMAN_ADV_LEGACY_NC \
>> -             +@KMOD_BATMAN_ADV_LEGACY_BATCTL
>> -endef
>> -
>> -define Package/fff-batman-adv-legacy/description
>> -    This is the batman-adv-legacy for the Freifunk Franken Firmware
>> -    It is used to configure batman-adv-legacy.
>> -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-legacy/install
>> -	$(CP) ./files/* $(1)/
>> -endef
>> -
>> -$(eval $(call BuildPackage,fff-batman-adv-legacy))
>> diff --git a/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-
>> defaults/93-fff-batman-adv b/src/packages/fff/fff-batman-adv-
>> legacy/files/etc/uci-defaults/93-fff-batman-adv
>> deleted file mode 100644
>> index 9bc3928..0000000
>> --- a/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-
>> defaults/93-fff-batman-adv
>> +++ /dev/null
>> @@ -1,22 +0,0 @@
>> -#!/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-
>> legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
>> b/src/packages/fff/fff-batman-adv-legacy/files/usr/lib/micron.d/fff-
>> batman-adv-legacy
>> deleted file mode 100644
>> index 21c857b..0000000
>> --- a/src/packages/fff/fff-batman-adv-
>> legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
>> +++ /dev/null
>> @@ -1 +0,0 @@
>> -*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl gw
>> client
>> 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-
>> batman-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
Tim Niemeyer Sept. 2, 2017, 4:51 p.m. 
Am Samstag, den 02.09.2017, 18:11 +0200 schrieb Christian Dresel:
> hi
> 
> On 02.09.2017 16:48, Tim Niemeyer wrote:
> > Am Samstag, den 02.09.2017, 15:42 +0200 schrieb Christian Dresel:
> > > 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
> > > ---
> > >  buildscript                                        |  7 ++--
> > >  src/packages/fff/fff-batman-adv-legacy/Makefile    | 44 --------
> > > ----
> > 
> > Du solltest nicht das ganze Paket entfernen. Deaktivieren reicht.
> > Vielleicht möchte das noch jemand verwenden.
> 
> Ich kann mir zwar kaum vorstellen, dass es dann noch jemand haben mag
Kann doch sein, dass jemand einen Standort wie Hardhoehe hat, aber mit
altem batman und aus Gründen noch nicht hochziehen möchte.

Ich denke aber auch, irgendwann fliegt es mal raus, aber das ist
definitiv unabhängig von der Einführung eines neuen Packages.

> aber wenn du es behalten willst, kann man auch einfach dieses Patch
> hernehmen:
> 
> https://pw.freifunk-franken.de/patch/210/
Dann würde ich vorschlagen, du baust das in dein Patchset ein. ;)

Tim

> da sollte es dann so drinnen sein. Meins ist nur darauf aufgebaut
> (deshalb Jan Kraus auch als Signed-off-by: mit dabei) und eben das
> alte
> gleich entfernt.
> 
> mfg
> 
> Christian
> 
> > 
> > Tim
> > 
> > > ----------
> > >  .../files/etc/uci-defaults/93-fff-batman-adv       | 22 --------
> > > ---
> > >  .../files/usr/lib/micron.d/fff-batman-adv-legacy   |  1 -
> > >  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 +-
> > >  8 files changed, 70 insertions(+), 72 deletions(-)
> > >  delete mode 100644 src/packages/fff/fff-batman-adv-
> > > legacy/Makefile
> > >  delete mode 100644 src/packages/fff/fff-batman-adv-
> > > legacy/files/etc/uci-defaults/93-fff-batman-adv
> > >  delete mode 100644 src/packages/fff/fff-batman-adv-
> > > legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
> > >  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..775e58c 100755
> > > --- a/buildscript
> > > +++ b/buildscript
> > > @@ -26,18 +26,16 @@ OPENWRT=(openwrt
> > >           $PACKAGEREV)
> > >  OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
> > >  
> > > -## Be careful: FFF uses COMPAT_VERSION 14 at the moment.
> > > -## See http://www.open-mesh.org/projects/batman-adv/wiki/Compatv
> > > ersi
> > > on
> > >  GLUON=(gluon
> > >              https://github.com/freifunk-gluon/packages.git
> > >              a18c69094c534bb7359d9c95c7b88ac047712574)
> > > -GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
> > > +GLUON_PKGS="micrond simple-tc uradvd"
> > >  
> > >  #official openwrt routing packages
> > >  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"
> > > @@ -510,3 +508,4 @@ case "$1" in
> > >          echo
> > >      ;;
> > >  esac
> > > +
> > > diff --git a/src/packages/fff/fff-batman-adv-legacy/Makefile
> > > b/src/packages/fff/fff-batman-adv-legacy/Makefile
> > > deleted file mode 100644
> > > index 48b9e50..0000000
> > > --- a/src/packages/fff/fff-batman-adv-legacy/Makefile
> > > +++ /dev/null
> > > @@ -1,44 +0,0 @@
> > > -include $(TOPDIR)/rules.mk
> > > -
> > > -PKG_NAME:=fff-batman-adv-legacy
> > > -PKG_VERSION:=1
> > > -PKG_RELEASE:=1
> > > -
> > > -PKG_BUILD_DIR:=$(BUILD_DIR)/fff-batman-adv-legacy
> > > -
> > > -include $(INCLUDE_DIR)/package.mk
> > > -
> > > -define Package/fff-batman-adv-legacy
> > > -    SECTION:=base
> > > -    CATEGORY:=Freifunk
> > > -    TITLE:=Freifunk-Franken batman-adv-legacy
> > > -    URL:=http://www.freifunk-franken.de
> > > -    DEPENDS:=+@PACKAGE_kmod-batman-adv-legacy \
> > > -             +@KMOD_BATMAN_ADV_LEGACY_BLA \
> > > -             +@KMOD_BATMAN_ADV_LEGACY_DAT \
> > > -             +@KMOD_BATMAN_ADV_LEGACY_NC \
> > > -             +@KMOD_BATMAN_ADV_LEGACY_BATCTL
> > > -endef
> > > -
> > > -define Package/fff-batman-adv-legacy/description
> > > -    This is the batman-adv-legacy for the Freifunk Franken
> > > Firmware
> > > -    It is used to configure batman-adv-legacy.
> > > -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-legacy/install
> > > -	$(CP) ./files/* $(1)/
> > > -endef
> > > -
> > > -$(eval $(call BuildPackage,fff-batman-adv-legacy))
> > > diff --git a/src/packages/fff/fff-batman-adv-
> > > legacy/files/etc/uci-
> > > defaults/93-fff-batman-adv b/src/packages/fff/fff-batman-adv-
> > > legacy/files/etc/uci-defaults/93-fff-batman-adv
> > > deleted file mode 100644
> > > index 9bc3928..0000000
> > > --- a/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-
> > > defaults/93-fff-batman-adv
> > > +++ /dev/null
> > > @@ -1,22 +0,0 @@
> > > -#!/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-
> > > legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
> > > b/src/packages/fff/fff-batman-adv-
> > > legacy/files/usr/lib/micron.d/fff-
> > > batman-adv-legacy
> > > deleted file mode 100644
> > > index 21c857b..0000000
> > > --- a/src/packages/fff/fff-batman-adv-
> > > legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
> > > +++ /dev/null
> > > @@ -1 +0,0 @@
> > > -*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl
> > > gw
> > > client
> > > 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-
> > > batman-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
> 
>
Christian Dresel Sept. 2, 2017, 5:17 p.m. 
hi

On 02.09.2017 18:51, Tim Niemeyer wrote:
> Am Samstag, den 02.09.2017, 18:11 +0200 schrieb Christian Dresel:
>> hi
>>
>> On 02.09.2017 16:48, Tim Niemeyer wrote:
>>> Am Samstag, den 02.09.2017, 15:42 +0200 schrieb Christian Dresel:
>>>> 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
>>>> ---
>>>>  buildscript                                        |  7 ++--
>>>>  src/packages/fff/fff-batman-adv-legacy/Makefile    | 44 --------
>>>> ----
>>>
>>> Du solltest nicht das ganze Paket entfernen. Deaktivieren reicht.
>>> Vielleicht möchte das noch jemand verwenden.
>>
>> Ich kann mir zwar kaum vorstellen, dass es dann noch jemand haben mag
> Kann doch sein, dass jemand einen Standort wie Hardhoehe hat, aber mit
> altem batman und aus Gründen noch nicht hochziehen möchte.
> 
> Ich denke aber auch, irgendwann fliegt es mal raus, aber das ist
> definitiv unabhängig von der Einführung eines neuen Packages.

überzeugt :)

> 
>> aber wenn du es behalten willst, kann man auch einfach dieses Patch
>> hernehmen:
>>
>> https://pw.freifunk-franken.de/patch/210/
> Dann würde ich vorschlagen, du baust das in dein Patchset ein. ;)

du willst doch nur das ich weiter mit git übe ;) Aber das macht
mittlerweile richtig Spaß, Patch ist raus.

mfg

Christian

> 
> Tim
> 
>> da sollte es dann so drinnen sein. Meins ist nur darauf aufgebaut
>> (deshalb Jan Kraus auch als Signed-off-by: mit dabei) und eben das
>> alte
>> gleich entfernt.
>>
>> mfg
>>
>> Christian
>>
>>>
>>> Tim
>>>
>>>> ----------
>>>>  .../files/etc/uci-defaults/93-fff-batman-adv       | 22 --------
>>>> ---
>>>>  .../files/usr/lib/micron.d/fff-batman-adv-legacy   |  1 -
>>>>  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 +-
>>>>  8 files changed, 70 insertions(+), 72 deletions(-)
>>>>  delete mode 100644 src/packages/fff/fff-batman-adv-
>>>> legacy/Makefile
>>>>  delete mode 100644 src/packages/fff/fff-batman-adv-
>>>> legacy/files/etc/uci-defaults/93-fff-batman-adv
>>>>  delete mode 100644 src/packages/fff/fff-batman-adv-
>>>> legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
>>>>  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..775e58c 100755
>>>> --- a/buildscript
>>>> +++ b/buildscript
>>>> @@ -26,18 +26,16 @@ OPENWRT=(openwrt
>>>>           $PACKAGEREV)
>>>>  OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
>>>>  
>>>> -## Be careful: FFF uses COMPAT_VERSION 14 at the moment.
>>>> -## See http://www.open-mesh.org/projects/batman-adv/wiki/Compatv
>>>> ersi
>>>> on
>>>>  GLUON=(gluon
>>>>              https://github.com/freifunk-gluon/packages.git
>>>>              a18c69094c534bb7359d9c95c7b88ac047712574)
>>>> -GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
>>>> +GLUON_PKGS="micrond simple-tc uradvd"
>>>>  
>>>>  #official openwrt routing packages
>>>>  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"
>>>> @@ -510,3 +508,4 @@ case "$1" in
>>>>          echo
>>>>      ;;
>>>>  esac
>>>> +
>>>> diff --git a/src/packages/fff/fff-batman-adv-legacy/Makefile
>>>> b/src/packages/fff/fff-batman-adv-legacy/Makefile
>>>> deleted file mode 100644
>>>> index 48b9e50..0000000
>>>> --- a/src/packages/fff/fff-batman-adv-legacy/Makefile
>>>> +++ /dev/null
>>>> @@ -1,44 +0,0 @@
>>>> -include $(TOPDIR)/rules.mk
>>>> -
>>>> -PKG_NAME:=fff-batman-adv-legacy
>>>> -PKG_VERSION:=1
>>>> -PKG_RELEASE:=1
>>>> -
>>>> -PKG_BUILD_DIR:=$(BUILD_DIR)/fff-batman-adv-legacy
>>>> -
>>>> -include $(INCLUDE_DIR)/package.mk
>>>> -
>>>> -define Package/fff-batman-adv-legacy
>>>> -    SECTION:=base
>>>> -    CATEGORY:=Freifunk
>>>> -    TITLE:=Freifunk-Franken batman-adv-legacy
>>>> -    URL:=http://www.freifunk-franken.de
>>>> -    DEPENDS:=+@PACKAGE_kmod-batman-adv-legacy \
>>>> -             +@KMOD_BATMAN_ADV_LEGACY_BLA \
>>>> -             +@KMOD_BATMAN_ADV_LEGACY_DAT \
>>>> -             +@KMOD_BATMAN_ADV_LEGACY_NC \
>>>> -             +@KMOD_BATMAN_ADV_LEGACY_BATCTL
>>>> -endef
>>>> -
>>>> -define Package/fff-batman-adv-legacy/description
>>>> -    This is the batman-adv-legacy for the Freifunk Franken
>>>> Firmware
>>>> -    It is used to configure batman-adv-legacy.
>>>> -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-legacy/install
>>>> -	$(CP) ./files/* $(1)/
>>>> -endef
>>>> -
>>>> -$(eval $(call BuildPackage,fff-batman-adv-legacy))
>>>> diff --git a/src/packages/fff/fff-batman-adv-
>>>> legacy/files/etc/uci-
>>>> defaults/93-fff-batman-adv b/src/packages/fff/fff-batman-adv-
>>>> legacy/files/etc/uci-defaults/93-fff-batman-adv
>>>> deleted file mode 100644
>>>> index 9bc3928..0000000
>>>> --- a/src/packages/fff/fff-batman-adv-legacy/files/etc/uci-
>>>> defaults/93-fff-batman-adv
>>>> +++ /dev/null
>>>> @@ -1,22 +0,0 @@
>>>> -#!/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-
>>>> legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
>>>> b/src/packages/fff/fff-batman-adv-
>>>> legacy/files/usr/lib/micron.d/fff-
>>>> batman-adv-legacy
>>>> deleted file mode 100644
>>>> index 21c857b..0000000
>>>> --- a/src/packages/fff/fff-batman-adv-
>>>> legacy/files/usr/lib/micron.d/fff-batman-adv-legacy
>>>> +++ /dev/null
>>>> @@ -1 +0,0 @@
>>>> -*/1 * * * * /usr/sbin/batctl gw off; sleep 1; /usr/sbin/batctl
>>>> gw
>>>> client
>>>> 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-
>>>> batman-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
>>