...
 
Commits (6)
......@@ -27,7 +27,7 @@ prepare_build:
retry: 2
script:
- pwd
- git clone git://github.com/freifunk-gluon/gluon.git
- git clone git://github.com/blocktrron/gluon
- cd gluon
- ln -s ../ site
- site/ci.sh build
......@@ -53,6 +53,11 @@ build:ar71xx_nand:
variables:
SELECTED_TARGETS: ar71xx-nand
build:ath79_generic:
<<: *build_template
variables:
SELECTED_TARGETS: ath79-generic
build:brcm2708_bcm2708:
<<: *build_template
variables:
......@@ -114,7 +119,7 @@ package:
script:
- mkdir tmp
- mv gluon/output/ . && rm -rf gluon/
- git clone git://github.com/freifunk-gluon/gluon.git
- git clone git://github.com/github.com/blocktrron/gluon
- mv output gluon/
- cd gluon
- ln -s ../ site
......
......@@ -4,9 +4,6 @@ set -ex
HERE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd "$HERE"
#export GLUON_BRANCH="${GLUON_BRANCH:-experimental}"
#export GLUON_PRIORITY="${GLUON_PRIORITY:-7}"
eval $(make -s -f helper.mk)
echo -e "COMMIT_DESCRIPTION: ${COMMIT_DESCRIPTION}"
......
......@@ -4,4 +4,4 @@ PACKAGES_FFDA_REPO=https://github.com/freifunk-darmstadt/ffda-packages.git
PACKAGES_FFDA_COMMIT=57622c757b0166f0e02ed58acbd7976426be9e87
PACKAGES_FFKA_REPO=https://gitlab.karlsruhe.freifunk.net/firmware/packages.git
PACKAGES_FFKA_COMMIT=1b74df4150508def3312fcd61387009645fb09b2
PACKAGES_FFKA_COMMIT=a629164553768837b6e2e32317ce3a3e325eb571
......@@ -2,7 +2,7 @@
hostname_prefix = 'ffka-',
site_name = 'Freifunk Karlsruhe',
site_code = 'ffka',
default_domain = 'legacy_ffka',
default_domain = 'ffka_default',
domain_director = {
enabled = true,
......
......@@ -212,7 +212,7 @@ GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_P
#Allow overriding some variables from the command line
DEFAULT_GLUON_CHECKOUT := v2018.2.2
DEFAULT_GLUON_CHECKOUT := owrt1907
GLUON_CHECKOUT ?= $(DEFAULT_GLUON_CHECKOUT)
ifndef GLUON_SITEDIR
......@@ -254,3 +254,5 @@ GLUON_LANGS ?= en de
GLUON_REGION ?= eu
GLUON_ATH10K_MESH ?= 11s
GLUON_DEPRECATED ?= 0