Merge remote-tracking branch 'x/master'
This commit is contained in:
commit
4dd3a72978
2 changed files with 6 additions and 2 deletions
|
@ -1,5 +1,5 @@
|
|||
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=(
|
||||
'*dir*615*d*'
|
||||
)
|
||||
|
|
6
build.sh
6
build.sh
|
@ -79,13 +79,17 @@ announce FFHH SITE PATH: "$site_path" >&2
|
|||
pushd "$site_path"
|
||||
# shellcheck source=/dev/null
|
||||
. ./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_AUTOUPDATER_BRANCH
|
||||
export GLUON_SITEDIR="${site_path}"
|
||||
export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_AUTOUPDATER_BRANCH}"
|
||||
popd
|
||||
|
||||
announce GLUON Variables:
|
||||
env | egrep '^GLUON' | sort
|
||||
|
||||
pushd "${gluon_path}"
|
||||
announce Starting make update...
|
||||
rm -rf "${GLUON_OUTPUTDIR}"
|
||||
|
|
Loading…
Reference in a new issue