From 994ddc8245ebb18048a409ad6991d873e6fde32d Mon Sep 17 00:00:00 2001
From: Helge Jung <hej@c3pb.de>
Date: Sat, 7 Jun 2014 15:29:00 +0200
Subject: [PATCH] batman-on-wan: reworked to use Lua in firmware
---
ffpb/gluon-batman-on-wan/Makefile | 8 ++++----
.../batman-on-wan/initial/020-batman-on-wan | 19 +++++++++++++++++++
.../batman-on-wan/initial/020-batman-on-wan | 11 -----------
3 files changed, 23 insertions(+), 15 deletions(-)
create mode 100644 ffpb/gluon-batman-on-wan/files/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan
delete mode 100644 ffpb/gluon-batman-on-wan/generate/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan
diff --git a/ffpb/gluon-batman-on-wan/Makefile b/ffpb/gluon-batman-on-wan/Makefile
index 6738e44..dd26cad 100644
--- a/ffpb/gluon-batman-on-wan/Makefile
+++ b/ffpb/gluon-batman-on-wan/Makefile
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
-PKG_NAME:=ffpb-batman-on-wan
-PKG_VERSION:=1
+PKG_NAME := gluon-batman-on-wan
+PKG_VERSION := 2
PKG_RELEASE:=$(GLUON_VERSION).$(GLUON_SITE_CODE)-$(GLUON_RELEASE).$(GLUON_CONFIG_VERSION)
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
@@ -12,7 +12,7 @@ define Package/gluon-batman-on-wan
SECTION:=gluon
CATEGORY:=Gluon
TITLE:=Option to enable mesh (batadv) on WAN port
- DEPENDS:=+gluon-core +gluon-mesh-batman-adv
+ DEPENDS:=+gluon-core +gluon-mesh-batman-adv +luci-lib-core
endef
define Package/gluon-batman-on-wan/description
@@ -36,7 +36,7 @@ define Build/Compile
endef
define Package/gluon-batman-on-wan/install
- $(GLUON_GENERATE) ./generate/* $(1)/
+ $(CP) ./files/* $(1)/
$(INSTALL_DIR) $(1)/lib/gluon
endef
diff --git a/ffpb/gluon-batman-on-wan/files/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan b/ffpb/gluon-batman-on-wan/files/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan
new file mode 100644
index 0000000..aa17119
--- /dev/null
+++ b/ffpb/gluon-batman-on-wan/files/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan
@@ -0,0 +1,19 @@
+#!/usr/bin/lua
+
+local site = require 'gluon.site_config'
+local sysconfig = require 'gluon.sysconfig'
+local uci = require 'luci.model.uci'
+
+local c = uci.cursor()
+
+c:section('network', 'interface', 'mesh_wan',
+ {
+ ifname = 'br-wan',
+ proto = 'batadv',
+ mesh = 'bat0',
+ auto = site.batman_on_wan,
+ }
+)
+
+c:save('network')
+c:commit('network')
diff --git a/ffpb/gluon-batman-on-wan/generate/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan b/ffpb/gluon-batman-on-wan/generate/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan
deleted file mode 100644
index 0641f41..0000000
--- a/ffpb/gluon-batman-on-wan/generate/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-uci_add network interface mesh_wan
-uci_set network mesh_wan ifname 'br-wan'
-uci_set network mesh_wan proto 'batadv'
-uci_set network mesh_wan mesh 'bat0'
-uci_set network mesh_wan auto @batman_on_wan@
-
-uci_commit network
--
GitLab