gluon-batman-adv-core: merge gluon-next-node into gluon-batman-adv-core
This commit is contained in:
parent
fb85d96d5e
commit
3fc9154d1d
@ -21,7 +21,6 @@ GLUON_SITE_PACKAGES := \
|
|||||||
gluon-luci-autoupdater \
|
gluon-luci-autoupdater \
|
||||||
gluon-luci-portconfig \
|
gluon-luci-portconfig \
|
||||||
gluon-luci-wifi-config \
|
gluon-luci-wifi-config \
|
||||||
gluon-next-node \
|
|
||||||
gluon-mesh-vpn-fastd \
|
gluon-mesh-vpn-fastd \
|
||||||
gluon-radvd \
|
gluon-radvd \
|
||||||
gluon-setup-mode \
|
gluon-setup-mode \
|
||||||
|
@ -13,7 +13,7 @@ define Package/gluon-mesh-batman-adv-core
|
|||||||
SECTION:=gluon
|
SECTION:=gluon
|
||||||
CATEGORY:=Gluon
|
CATEGORY:=Gluon
|
||||||
TITLE:=Support for batman-adv meshing (core)
|
TITLE:=Support for batman-adv meshing (core)
|
||||||
DEPENDS:=+gluon-core +libgluonutil +gluon-client-bridge +firewall +libiwinfo +kmod-dummy
|
DEPENDS:=+gluon-core +libgluonutil +gluon-client-bridge +gluon-ebtables +firewall +libiwinfo +kmod-dummy +kmod-macvlan
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Prepare
|
define Build/Prepare
|
||||||
|
@ -23,3 +23,11 @@ need_boolean('mesh_on_lan', false)
|
|||||||
if need_table('mesh', nil, false) and need_table('mesh.batman_adv', nil, false) then
|
if need_table('mesh', nil, false) and need_table('mesh.batman_adv', nil, false) then
|
||||||
need_number('mesh.batman_adv.gw_sel_class', false)
|
need_number('mesh.batman_adv.gw_sel_class', false)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
need_string_match('next_node.mac', '^%x[02468aAcCeE]:%x%x:%x%x:%x%x:%x%x:%x%x$')
|
||||||
|
|
||||||
|
if need_string_match('next_node.ip4', '^%d+.%d+.%d+.%d+$', false) then
|
||||||
|
need_string_match('prefix4', '^%d+.%d+.%d+.%d+/%d+$')
|
||||||
|
end
|
||||||
|
|
||||||
|
need_string_match('next_node.ip6', '^[%x:]+$', false)
|
||||||
|
@ -1,41 +0,0 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
|
||||||
|
|
||||||
PKG_NAME:=gluon-next-node
|
|
||||||
PKG_VERSION:=3
|
|
||||||
|
|
||||||
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
|
|
||||||
|
|
||||||
include $(GLUONDIR)/include/package.mk
|
|
||||||
|
|
||||||
|
|
||||||
define Package/gluon-next-node
|
|
||||||
SECTION:=gluon
|
|
||||||
CATEGORY:=Gluon
|
|
||||||
TITLE:=Next-node anycast address
|
|
||||||
DEPENDS:=+gluon-core +gluon-ebtables +gluon-mesh-batman-adv +kmod-macvlan
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/gluon-next-node/description
|
|
||||||
Gluon community wifi mesh firmware framework: next-node anycast address
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/Prepare
|
|
||||||
mkdir -p $(PKG_BUILD_DIR)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/Configure
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/Compile
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/gluon-next-node/install
|
|
||||||
$(CP) ./files/* $(1)/
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/gluon-next-node/postinst
|
|
||||||
#!/bin/sh
|
|
||||||
$(call GluonCheckSite,check_site.lua)
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call BuildPackage,gluon-next-node))
|
|
@ -1,7 +0,0 @@
|
|||||||
if need_string_match('next_node.ip4', '^%d+.%d+.%d+.%d+$', false) then
|
|
||||||
need_string_match('prefix4', '^%d+.%d+.%d+.%d+/%d+$')
|
|
||||||
end
|
|
||||||
|
|
||||||
need_string_match('next_node.ip6', '^[%x:]+$', false)
|
|
||||||
|
|
||||||
need_string_match('next_node.mac', '^%x[02468aAcCeE]:%x%x:%x%x:%x%x:%x%x:%x%x$')
|
|
Loading…
Reference in New Issue
Block a user