sprinterfreak
/
site-ffrgb-dev
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: sprinterfreak:master
Branches Tags
sprinterfreak:master
sprinterfreak:v2019.1-experimental
sprinterfreak:experimental
...
pull from: sprinterfreak:v2019.1-experimental
Branches Tags
sprinterfreak:v2019.1-experimental
sprinterfreak:experimental
sprinterfreak:master

6 Commits
master ... v2019.1-ex

Author SHA1 Message Date
Jan d7855a133e Reduce CI build targets to x86-64 2019-10-16 20:41:21 +02:00
Jan e744a667c1 Domain config specify batman mesh version 4 2019-10-15 18:17:05 +02:00
Jan 4f7ff86dae Bump gluon upstream version to v2019.1 2019-10-14 18:45:32 +02:00
Jan f4c163912e Update gluon ref to v2018.2.2 
* IMPORTANT: Fixes vulnerabilities that allowed for remote crashes and denial of service attacks through the Linux kernels TCP selective acknowledgement implementation. (CVE-2019-11477, CVE-2019-11478 and CVE-2019-11479)
 2019-06-24 18:34:51 +02:00
Jan f4790b36b9 Remove deprecated supported_rates config 
wifi24.supported_rates is obsolete. 802.11b rates are disabled by default
 2019-06-22 18:30:23 +02:00
Jan d33cdd3099 Introduce new targets and gitlab-ci rule 
* Adds .gitlab-ci.yml
* Lots of new targets available
* Update Gluon-Git-Ref ref
* Gluon switched back to openwrt instead of lede. Fix Package sources.
 2019-06-22 13:48:35 +02:00
7 changed files with 31 additions and 42 deletions
Show Stats Expand all files Collapse all files

6
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,6 @@
before_script:
- sudo apt-get update -qq && sudo apt-get install -y -qq build-essential gawk unzip libncurses-dev libz-dev libssl-dev wget git subversion python-pip python3-pip
fullbuild:
script:
- make V=s FORCE_UNSAFE_CONFIGURE=1 GLUON_BRANCH=experimental GLUON_RELEASE=v2019.1 GLUON_GIT_REF=82244336bc5a10eec383d81068612bdb2eecd37d GLUON_TARGETS="x86-64"

22
Makefile
View File

@ -1,22 +1,31 @@
GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon
GLUON_GIT_REF := v2018.1
GLUON_BUILD_DIR ?= gluon-build
GLUON_GIT_URL ?= https://github.com/freifunk-gluon/gluon
GLUON_GIT_REF ?= 2ce07ae2fe251bcf8a424dc39aba8da1df7f164d
GLUON_DEPRECATED ?= upgrade
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
GLUON_TARGETS ?= \
ar71xx-generic \
ar71xx-tiny \
ar71xx-mikrotik \
ar71xx-nand \
ar71xx-tiny \
brcm2708-bcm2708 \
brcm2708-bcm2709 \
brcm2708-bcm2710 \
ipq40xx \
ipq806x \
mpc85xx-generic \
mvebu-cortexa9 \
ramips-mt7620 \
ramips-mt7621 \
ramips-mt76x8 \
ramips-rt305x \
sunxi-cortexa7 \
x86-64 \
x86-generic \
x86-geode \
sunxi
x86-geode
GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
@ -33,6 +42,7 @@ JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
GLUON_MAKE := ${MAKE} BROKEN=0 -j ${JOBS} -C ${GLUON_BUILD_DIR} \
GLUON_RELEASE=${GLUON_RELEASE} \
GLUON_BRANCH=${GLUON_BRANCH} \
GLUON_DEPRECATED=${GLUON_DEPRECATED}
all: info

8
domains/ffrgb.conf
View File

@ -3,12 +3,7 @@
domain_seed = 'c8951e3a104d55543da98ee732468ea121878e77c6d18cbcbefb5409c292601a',
hide_domain = true,
opkg = {
--[[ old
openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
]]
lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
},
opkg = { openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages' },
prefix4 = '10.90.0.0/19',
prefix6 = 'fdef:f00f:1337:cafe::/64',
@ -55,6 +50,7 @@
vxlan = false,
filter_membership_reports = false,
batman_adv = {
routing_algo = 'BATMAN_IV',
gw_sel_class = 1,
},
},

8
domains/ffrgb_cty.conf
View File

@ -2,12 +2,7 @@
domain_names = { ffrgb_cty = 'Regensburg Stadt' },
domain_seed = '1124de9b0fe2dde424c8a4c481816b5899e6d1b4b4cf72de42136c4f1f197c7a',
opkg = {
--[[ old
openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
]]
lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
},
opkg = { openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages' },
prefix4 = '10.90.32.0/19',
prefix6 = 'fdef:f10f:1337:cafe::/64',
@ -57,6 +52,7 @@
vxlan = true,
filter_membership_reports = false,
batman_adv = {
routing_algo = 'BATMAN_IV',
gw_sel_class = 1,
},
},

8
domains/ffrgb_tst.conf
View File

@ -3,12 +3,7 @@
domain_seed = 'bcd0ceca2c68b5b9a5975156a0ec0a04aebe3300d9928a04dc57001cc96db252',
hide_domain = true,
opkg = {
--[[ old
openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
]]
lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
},
opkg = { openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages' },
prefix4 = '10.90.96.0/19',
prefix6 = 'fdef:f30f:1337:cafe::/64',
@ -58,6 +53,7 @@
vxlan = true,
filter_membership_reports = false,
batman_adv = {
routing_algo = 'BATMAN_IV',
gw_sel_class = 1,
},
},

8
domains/ffrgb_uml.conf
View File

@ -2,12 +2,7 @@
domain_names = { ffrgb_uml = 'Regensburg Umland' },
domain_seed = 'f3d54e3dfc4108dd3356664bbab4baef3b2920ad943c27edce4b284a68e776fd',
opkg = {
--[[ old
openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
]]
lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
},
opkg = { openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages' },
prefix4 = '10.90.64.0/19',
prefix6 = 'fdef:f20f:1337:cafe::/64',
@ -57,6 +52,7 @@
vxlan = true,
filter_membership_reports = false,
batman_adv = {
routing_algo = 'BATMAN_IV',
gw_sel_class = 1,
},
},

13
site.conf
View File

@ -4,12 +4,7 @@
site_code = 'ffrgb',
default_domain = 'ffrgb',
opkg = {
--[[ old
openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
]]
lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
},
opkg = { openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages' },
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
@ -18,12 +13,6 @@
regdom = 'DE',
wifi24 = {
-- disable 802.11b support:
supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000}, -- List of supported wifi rates (optional)
basic_rate = {6000, 9000, 18000, 36000, 54000}, -- List of basic wifi rates (optional, required if supported_rates is set)
},
mesh_vpn = {
mtu = 1426,
fastd = {