freifunk/site-ffhh
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'x/master'

Browse source
This commit is contained in:
Daniel Frank 2022-03-21 21:55:52 +01:00
commit 4dd3a72978
Signed by: tokudan
GPG key ID: 063CCCAD04182D32
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.conf
View file

@ -1,5 +1,5 @@
GLUON_RELEASE="v2021.1.1.0" GLUON_RELEASE="v2021.1.1.0"
targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode" targets="ar71xx-generic ar71xx-nand ar71xx-tiny ath79-generic brcm2708-bcm2708 brcm2708-bcm2709 ipq40xx-generic ipq806x-generic lantiq-xrx200 lantiq-xway mpc85xx-generic mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x x86-64 x86-generic x86-geode x86-legacy"
broken_images=( broken_images=(
'*dir*615*d*' '*dir*615*d*'
) )

6
build.sh
View file

@ -79,13 +79,17 @@ announce FFHH SITE PATH: "$site_path" >&2
pushd "$site_path" pushd "$site_path"
# shellcheck source=/dev/null # shellcheck source=/dev/null
. ./build.conf . ./build.conf
[ "${GLUON_AUTOUPDATER_BRANCH:-experimental}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)" GLUON_AUTOUPDATER_BRANCH="${GLUON_AUTOUPDATER_BRANCH:-experimental}"
[ "${GLUON_AUTOUPDATER_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
export GLUON_RELEASE export GLUON_RELEASE
export GLUON_AUTOUPDATER_BRANCH export GLUON_AUTOUPDATER_BRANCH
export GLUON_SITEDIR="${site_path}" export GLUON_SITEDIR="${site_path}"
export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_AUTOUPDATER_BRANCH}" export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_AUTOUPDATER_BRANCH}"
popd popd
announce GLUON Variables:
env | egrep '^GLUON' | sort
pushd "${gluon_path}" pushd "${gluon_path}"
announce Starting make update... announce Starting make update...
rm -rf "${GLUON_OUTPUTDIR}" rm -rf "${GLUON_OUTPUTDIR}"