Make changes necessary for v2017.1

* Rename gluon-luci-* to gluon-web-*
* Remove openwrt package repo (the usual LEDE repo has IPv6 connectivity)
* Remove package gluon-next-node (the functionality has been merged into other
  packages)
* Move fastd configuration to new mesh_vpn subsection
This commit is contained in:
Jan-Philipp Litza 2017-02-26 17:06:38 +01:00
parent 6737c22962
commit 20102c3f1e
No known key found for this signature in database
GPG Key ID: 1FB658053CE27196
3 changed files with 38 additions and 37 deletions

View File

@ -1,4 +1,5 @@
GLUON_SITE_FEEDS='ffhb' GLUON_SITE_FEEDS='ffhb'
PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
PACKAGES_FFHB_COMMIT=d3ec6bba927f755e1a6f43c132aae8c97217bd8d PACKAGES_FFHB_BRANCH=v2017.1
PACKAGES_FFHB_COMMIT=ee75f9971712b1595e2f397963c0bdfb03114a1c

View File

@ -54,11 +54,12 @@
mac = '16:41:95:40:f7:dc', mac = '16:41:95:40:f7:dc',
}, },
fastd_mesh_vpn = { mesh_vpn = {
methods = {'salsa2012+umac'},
enabled = true, enabled = true,
configurable = true,
mtu = 1280, mtu = 1280,
fastd = {
methods = {'salsa2012+umac'},
configurable = true,
groups = { groups = {
backbone = { backbone = {
limit = 1, limit = 1,
@ -86,6 +87,7 @@
}, },
}, },
}, },
},
bandwidth_limit = { bandwidth_limit = {
enabled = false, enabled = false,
egress = 1800, egress = 1800,
@ -94,7 +96,6 @@
}, },
opkg = { opkg = {
openwrt = 'http://downloads.bremen.freifunk.net/opkg/openwrt/%n/%v/%S/packages',
extra = { extra = {
modules = 'http://downloads.bremen.freifunk.net/opkg/modules/gluon-%GS-%GR/%S', modules = 'http://downloads.bremen.freifunk.net/opkg/modules/gluon-%GS-%GR/%S',
}, },

17
site.mk
View File

@ -12,14 +12,13 @@ GLUON_SITE_PACKAGES := \
gluon-ebtables-filter-multicast \ gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \ gluon-ebtables-filter-ra-dhcp \
gluon-ebtables-segment-mld \ gluon-ebtables-segment-mld \
gluon-luci-admin \ gluon-web-admin \
gluon-luci-autoupdater \ gluon-web-autoupdater \
gluon-luci-mesh-vpn-fastd \ gluon-web-mesh-vpn-fastd \
gluon-luci-portconfig \ gluon-web-network \
gluon-luci-private-wifi \ gluon-web-private-wifi \
gluon-luci-wifi-config \ gluon-web-wifi-config \
gluon-mesh-vpn-fastd \ gluon-mesh-vpn-fastd \
gluon-next-node \
gluon-radv-filterd \ gluon-radv-filterd \
gluon-radvd \ gluon-radvd \
gluon-setup-mode \ gluon-setup-mode \
@ -31,10 +30,10 @@ GLUON_SITE_PACKAGES := \
firewall \ firewall \
haveged haveged
# Variables set with ?= can be overwritten from the command line # Allow overriding the these variables from the command line
GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+)) GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))
export GLUON_BRANCH ?= stable export GLUON_BRANCH ?= stable
GLUON_PRIORITY ?= 7 GLUON_PRIORITY ?= 0
GLUON_LANGS ?= en de GLUON_LANGS ?= en de
GLUON_REGION ?= eu GLUON_REGION ?= eu
GLUON_ATH10K_MESH ?= ibss GLUON_ATH10K_MESH ?= ibss