From patchwork Sat Oct 14 20:38:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [SQUASHED,v18,1/8] Update Batman to compat15 From: Tim Niemeyer X-Patchwork-Id: 583 Message-Id: <20171014203840.29696-2-tim@tn-x.org> To: franken-dev@freifunk.net Cc: Jan Kraus Date: Sat, 14 Oct 2017 22:38:33 +0200 From: Christian Dresel This is not compatible with the old Batman! Signed-off-by: Jan Kraus Signed-off-by: Christian Dresel Signed-off-by: Fabian Bläse Reviewed-by: Fabian Bläse Signed-off-by: Tim Niemeyer --- Changes in v18: None Changes in v17: None Changes in v16: None Changes in v15: None Changes in v14: None Changes in v13: None Changes in v12: None Changes in v11: None Changes in v10: None Changes in v9: - rebase onto 20170918-beta Changes in v8: - rebase onto 20170918-beta Changes in v7: None Changes in v6: None Changes in v5: None Changes in v4: - Add batctl to ROUTING feed Changes in v3: -don't delete the batman-adv-legacy packages Changes in v2: - no File mode change - remove legacy commentary 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 c9abe99..434b5d3 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 @@ -38,7 +38,7 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd" ROUTING=(routing https://git.lede-project.org/feed/routing.git d11075cd40a88602bf4ba2b275f72100ddcb4767) # lede-17.01 -ROUTING_PKGS="alfred" +ROUTING_PKGS="kmod-batman-adv batctl 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-batman-adv @@ -0,0 +1,22 @@ +#!/bin/sh + +uci batch <