[RFC PATCH v3 7/8] updated batman-adv

[Jan Kraus]

Signed-off-by: Jan Kraus <mayosemmel at gmail.com>
---
 buildscript                                        |  4 +-
 src/packages/fff/fff-batman-adv-legacy/Makefile    | 44 ----------------------
 .../files/usr/lib/micron.d/fff-batman-adv-legacy   |  1 -
 src/packages/fff/fff-batman-adv/Makefile           | 43 +++++++++++++++++++++
 .../files/usr/lib/micron.d/fff-batman-adv          |  1 +
 .../fff/fff-hoods/files/usr/sbin/configurehood     |  2 +-
 src/packages/fff/fff/Makefile                      |  2 +-
 7 files changed, 48 insertions(+), 49 deletions(-)
 delete mode 100644 src/packages/fff/fff-batman-adv-legacy/Makefile
 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/usr/lib/micron.d/fff-batman-adv

diff --git a/buildscript b/buildscript
index c79e5f2..d45819d 100755
--- a/buildscript
+++ b/buildscript
@@ -31,13 +31,13 @@ OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl"
 GLUON=(gluon
             https://github.com/freifunk-gluon/packages.git
             bdb56bba02168a7fdd7c8bbf380ae59a4febac7c)
-GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd ecdsautils"
+GLUON_PKGS="micrond simple-tc uradvd ecdsautils"
 
 #official openwrt routing packages
 ROUTING=(routing
             https://github.com/openwrt-routing/packages.git
             810780abb1edad35b9117511e220723d8cb9662b)
-ROUTING_PKGS="alfred"
+ROUTING_PKGS="kmod-batman-adv batctl alfred"
 
 FFF=(fff)
 FFF_PKGS="-a"
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:=+ at PACKAGE_kmod-batman-adv-legacy \
-             + at KMOD_BATMAN_ADV_LEGACY_BLA \
-             + at KMOD_BATMAN_ADV_LEGACY_DAT \
-             + at KMOD_BATMAN_ADV_LEGACY_NC \
-             + at 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/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..6631039
--- /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/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-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
index ae69a3b..46b0807 100755
--- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
+++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
@@ -22,7 +22,7 @@ else
 
     json_select hood
     json_get_var protocol protocol
-    if [ "$protocol" != "batman-adv-v14" ]; then
+    if [ "$protocol" != "batman-adv-2016.1" ]; then
       echo "Unknown protocol in $hood"
       continue
     fi
diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
index eef122b..e2cc511 100644
--- a/src/packages/fff/fff/Makefile
+++ b/src/packages/fff/fff/Makefile
@@ -18,7 +18,7 @@ define Package/fff-base
              +fff-nodewatcher \
              +fff-web \
              +fff-uradvd \
-             +fff-batman-adv-legacy \
+             +fff-batman-adv \
              +fff-fastd \
              +fff-firewall \
              +fff-support \
-- 
2.1.4