krombel/site-ffmuc
1
0
Fork 0
forked from remote/site-ffmuc
Code Issues 4 Pull Requests 1 Releases Wiki Activity

Compare commits

merge into: krombel:babel
Branches Tags
krombel:krombel/v2018.1 krombel:release-v2018.1 krombel:release-v2018.0 krombel:krombel/v2018.0-on2016 krombel:stable krombel:master krombel:site-select-foo krombel:babel-test krombel:new_buildserver_key krombel:experimental krombel:welcome krombel:umland krombel:babel krombel:altdorf
krombel:v2018.0-rc1 krombel:v2018.1-krombel
...
pull from: krombel:experimental
Branches Tags
krombel:release-v2018.1 krombel:release-v2018.0 krombel:krombel/v2018.0-on2016 krombel:krombel/v2018.1 krombel:stable krombel:master krombel:site-select-foo krombel:babel-test krombel:new_buildserver_key krombel:experimental krombel:welcome krombel:umland krombel:babel krombel:altdorf
krombel:v2018.0-rc1 krombel:v2018.1-krombel

6 Commits
babel ... experiment

Author SHA1 Message Date
Franz Pletz
d116887d1a Images are now placed in output/images 2015-11-05 01:50:07 +01:00
Franz Pletz
a8d7aca312 Update to current gluon master 2015-11-05 01:46:37 +01:00
Franz Pletz
1e49768ce6 Update to current gluon master 2015-10-17 16:13:10 +02:00
Franz Pletz
b3babe75d6 Update to current gluon master 2015-10-16 01:50:32 +02:00
Franz Pletz
b3dc38716c Set batman gw selection class to 3 (fast switch) 2015-10-14 21:30:02 +02:00
Franz Pletz
9dacd3de94 Update to current gluon master 2015-10-14 21:27:24 +02:00
2 changed files with 14 additions and 8 deletions
Expand all files Collapse all files

16
Makefile
View File

@@ -1,6 +1,6 @@
GLUON_BUILD_DIR := gluon-build GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
GLUON_GIT_REF := f7f71cafceaaf07575313457908a3e2257b83433 GLUON_GIT_REF := 72e554fcff0c9f67c62630a41557eac30fa480a8
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
@@ -41,15 +41,15 @@ build: gluon-prepare
manifest: build manifest: build
${GLUON_MAKE} manifest ${GLUON_MAKE} manifest
mv ${GLUON_BUILD_DIR}/images . mv ${GLUON_BUILD_DIR}/output .
sign: manifest sign: manifest
${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest ${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} output/images/sysupgrade/${GLUON_BRANCH}.manifest
${GLUON_BUILD_DIR}: ${GLUON_BUILD_DIR}:
git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR} git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
gluon-prepare: images-clean ${GLUON_BUILD_DIR} gluon-prepare: output-clean ${GLUON_BUILD_DIR}
(cd ${GLUON_BUILD_DIR} \ (cd ${GLUON_BUILD_DIR} \
&& git remote set-url origin ${GLUON_GIT_URL} \ && git remote set-url origin ${GLUON_GIT_URL} \
&& git fetch origin \ && git fetch origin \
@@ -60,7 +60,7 @@ gluon-prepare: images-clean ${GLUON_BUILD_DIR}
gluon-clean: gluon-clean:
rm -rf ${GLUON_BUILD_DIR} rm -rf ${GLUON_BUILD_DIR}
images-clean: output-clean:
rm -rf images rm -rf output
clean: gluon-clean images-clean clean: gluon-clean output-clean

6
site.conf
View File

@@ -48,6 +48,12 @@
}, },
}, },
mesh = {
batman_adv = {
gw_sel_class = 3,
},
},
next_node = { next_node = {
ip4 = '10.80.0.1', ip4 = '10.80.0.1',
ip6 = 'fdef:ffc0:4fff::1', ip6 = 'fdef:ffc0:4fff::1',