Compare commits
1 Commits
v2019.1-ex
...
master
Author | SHA1 | Date | |
---|---|---|---|
2df350de04 |
@ -3,4 +3,4 @@ before_script:
|
||||
|
||||
fullbuild:
|
||||
script:
|
||||
- make V=s FORCE_UNSAFE_CONFIGURE=1 GLUON_BRANCH=experimental GLUON_RELEASE=v2019.1 GLUON_GIT_REF=82244336bc5a10eec383d81068612bdb2eecd37d GLUON_TARGETS="x86-64"
|
||||
- make V=s FORCE_UNSAFE_CONFIGURE=1 GLUON_BRANCH=experimental GLUON_RELEASE=v2018.2.1 GLUON_GIT_REF=7d386a66f36c947f1c0770f64ab71f22cac1b21a
|
||||
|
25
Makefile
25
Makefile
@ -10,6 +10,12 @@ GLUON_TARGETS ?= \
|
||||
ar71xx-generic \
|
||||
ar71xx-mikrotik \
|
||||
ar71xx-nand \
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
brcm2708-bcm2708 \
|
||||
brcm2708-bcm2709 \
|
||||
mpc85xx-generic \
|
||||
=======
|
||||
ar71xx-tiny \
|
||||
brcm2708-bcm2708 \
|
||||
brcm2708-bcm2709 \
|
||||
@ -19,13 +25,32 @@ GLUON_TARGETS ?= \
|
||||
mpc85xx-generic \
|
||||
mvebu-cortexa9 \
|
||||
ramips-mt7620 \
|
||||
>>>>>>> 250237d... Introduce new targets and gitlab-ci rule
|
||||
=======
|
||||
ipq40xx \
|
||||
ipq806x \
|
||||
brcm2708-bcm2708 \
|
||||
brcm2708-bcm2709 \
|
||||
brcm2708-bcm2710 \
|
||||
pc85xx-generic \
|
||||
ramips-mt7620 \
|
||||
>>>>>>> 2d27e51... New targets, latest gluon commit as default
|
||||
ramips-mt7621 \
|
||||
ramips-mt76x8 \
|
||||
ramips-rt305x \
|
||||
sunxi-cortexa7 \
|
||||
x86-64 \
|
||||
x86-generic \
|
||||
<<<<<<< HEAD
|
||||
x86-geode \
|
||||
<<<<<<< HEAD
|
||||
sunxi
|
||||
=======
|
||||
x86-geode
|
||||
>>>>>>> 250237d... Introduce new targets and gitlab-ci rule
|
||||
=======
|
||||
sunxi-cortexa7
|
||||
>>>>>>> 2d27e51... New targets, latest gluon commit as default
|
||||
|
||||
|
||||
GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
|
||||
|
@ -50,7 +50,6 @@
|
||||
vxlan = false,
|
||||
filter_membership_reports = false,
|
||||
batman_adv = {
|
||||
routing_algo = 'BATMAN_IV',
|
||||
gw_sel_class = 1,
|
||||
},
|
||||
},
|
||||
|
@ -52,7 +52,6 @@
|
||||
vxlan = true,
|
||||
filter_membership_reports = false,
|
||||
batman_adv = {
|
||||
routing_algo = 'BATMAN_IV',
|
||||
gw_sel_class = 1,
|
||||
},
|
||||
},
|
||||
|
@ -53,7 +53,6 @@
|
||||
vxlan = true,
|
||||
filter_membership_reports = false,
|
||||
batman_adv = {
|
||||
routing_algo = 'BATMAN_IV',
|
||||
gw_sel_class = 1,
|
||||
},
|
||||
},
|
||||
|
@ -52,7 +52,6 @@
|
||||
vxlan = true,
|
||||
filter_membership_reports = false,
|
||||
batman_adv = {
|
||||
routing_algo = 'BATMAN_IV',
|
||||
gw_sel_class = 1,
|
||||
},
|
||||
},
|
||||
|
@ -13,6 +13,12 @@
|
||||
|
||||
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 = {
|
||||
|
Loading…
Reference in New Issue
Block a user