ffhb/gluon-site-ffhb
ffhb
/
gluon-site-ffhb
mirror of https://github.com/FreifunkBremen/gluon-site-ffhb.git
1
1
Fork 0
Code Issues Releases Wiki Activity

feat(gluon): update to 2021.1.2

This commit is contained in:
genofire 2022-07-20 19:48:38 +02:00
parent 7e452822ef
commit 6199e828e2
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.sh
View File

@ -33,9 +33,13 @@ done
# generate manifests # generate manifests
make manifest make manifest
if [ -z "${GLUON_BRANCH:-}" ]; then if [ -z "${GLUON_AUTOUPDATER_BRANCH:-}" ]; then
make manifest GLUON_BRANCH=babel GLUON_PRIORITY=0 make manifest GLUON_AUTOUPDATER_BRANCH=testing GLUON_PRIORITY=0
ln -sf babel.manifest "${GLUON_DIR}/output/images/sysupgrade/manifest" # add BRANCH=nightly line below BRANCH=testing line
sed -i -e "/^BRANCH=testing/ a BRANCH=nightly" \
"${GLUON_DIR}/output/images/sysupgrade/testing.manifest"
ln -sf testing.manifest "${GLUON_DIR}/output/images/sysupgrade/nightly.manifest"
ln -sf testing.manifest "${GLUON_DIR}/output/images/sysupgrade/manifest"
fi fi
# sign testing/nightly manifest if key is present # sign testing/nightly manifest if key is present

2
gluon

@ -1 +1 @@
Subproject commit 0394047a70cae09deef69e4a10b7b559e96ceeef Subproject commit d0f43aeb0810bd0841c90dc1bc0c18d7aa591fa7

5
site.mk
View File

@ -13,7 +13,7 @@ GLUON_SITE_PACKAGES := \
gluon-speedtest \ gluon-speedtest \
iwinfo \ iwinfo \
firewall \ firewall \
haveged \ urngd \
gluon-authorized-keys gluon-authorized-keys
#TODO iptables ? #TODO iptables ?
#TODO iputils-ping6 ? #TODO iputils-ping6 ?
@ -32,13 +32,12 @@ GLUON_SITE_PACKAGES += \
# Allow overriding the these variables 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=+))
GLUON_AUTOUPDATE_BRANCH ?= stable GLUON_AUTOUPDATER_BRANCH ?= stable
GLUON_AUTOUPDATER_ENABLED ?= 1 GLUON_AUTOUPDATER_ENABLED ?= 1
GLUON_PRIORITY ?= 0 GLUON_PRIORITY ?= 0
GLUON_DEPRECATED ?= 0 GLUON_DEPRECATED ?= 0
GLUON_LANGS ?= en de GLUON_LANGS ?= en de
GLUON_REGION ?= eu GLUON_REGION ?= eu
GLUON_WLAN_MESH ?= 11s
# Debug packages # Debug packages