diff --git a/builder.sh b/builder.sh index 0dcd69fc3a61e392702f54f25df64bc559acae54..c42fdd73efe99b9b31f460b1b7182dab6b645f2c 100755 --- a/builder.sh +++ b/builder.sh @@ -27,16 +27,11 @@ ARCHITECTURES=( ar71xx-tiny\ #ARCHITECTURES=( x86-64 ) #BRANCH=stable #BRANCH=unbranded_stable -BRANCH=experimental -#BRANCH=beta +#BRANCH=experimental +BRANCH=beta # prepare needed strings -GLUONVERSION=$(git describe --tags | cut -d "-" -f 1) -if [[ $GLUONVERSION = "ffbs"* ]]; then - : -else - GLUONVERSION=ffbs${GLUONVERSION} -fi +GLUONVERSION=$(git describe --tags) SITECOMMIT=$(cd site; git log -1 --format="%H") ARCHSTRING=multiarch if [ "${#ARCHITECTURES[@]}" -eq "1" ]; then @@ -47,12 +42,12 @@ RELEASETAG=${GLUONVERSION}_${BRANCH}_${ARCHSTRING}_$(date '+%Y%m%d-%H%M')_${SITE echo $RELEASETAG -#DEBUG="V=s" -DEBUG="" +DEBUG="V=s" +#DEBUG="" # Days until the autoupdater makes sure that the new vesion gets installed # (maybe define based on the branch?) -PRIO=2 +PRIO=0 # prepare site.conf from template if [ -f site/site.conf ]; then @@ -83,7 +78,7 @@ do # Doing the Build # ############### - make all GLUON_TARGET=$ARCHITECTURE $DEBUG -j24 GLUON_RELEASE=${RELEASENAME} GLUON_BRANCH=$BRANCH GLUON_PRIORITY=$PRIO GLUON_ATH10K_MESH=ibss + make all GLUON_TARGET=$ARCHITECTURE $DEBUG -j1 GLUON_RELEASE=${RELEASENAME} GLUON_BRANCH=$BRANCH GLUON_PRIORITY=$PRIO GLUON_ATH10K_MESH=ibss echo Exiting with Code $? done