diff --git a/make-release.sh b/make-release.sh index 980d7460ef51d08d82f853d505927fd9b5524a63..a2cb97dc340efaaa9938e68185b2b6c7d5515669 100755 --- a/make-release.sh +++ b/make-release.sh @@ -15,8 +15,8 @@ set -u set -e # if version is unset, will use the default experimental version from site.mk -#VERSION=${3:-"2017.1.2~exp$(date '+%y%m%d%H%M')"} -VERSION=${3:-"2017.1.2~exp$"} +#VERSION=${3:-"2017.1.3~exp$(date '+%y%m%d%H%M')"} +VERSION=${3:-"2017.1.3~exp$"} # branch must be set to either experimental, beta or stable BRANCH=${2:-"stable"} # must point to valid ecdsa signing key created by ecdsakeygen, relative to Gluon base directory diff --git a/modules b/modules index f13a42942c29aed0972d48105eeff76e483f4ed4..baab4305a9ec7464901faf27284c67d387da535e 100644 --- a/modules +++ b/modules @@ -1,22 +1,25 @@ # This file allows specifying additional repositories to use # when building gluon. -GLUON_SITE_FEEDS='ffki eulenfunk ssidchanger roamguide' +GLUON_SITE_FEEDS='ffki eulenfunk ssidchanger roamguide alt' # the git repository from where to clone the package feed PACKAGES_FFKI_REPO=git://github.com/freifunk-kiel/ffki-packages.git PACKAGES_EULENFUNK_REPO=https://github.com/Freifunk-Nord/eulenfunk-packages PACKAGES_SSIDCHANGER_REPO=https://github.com/freifunk-nord/gluon-ssid-changer.git PACKAGES_ROAMGUIDE_REPO=https://github.com/sargon/roamguide +PACKAGES_ALT_REPO=https://github.com/rubo77/gluon-alt-esc # the version/commit of the git repository to clone PACKAGES_FFKI_COMMIT=dbdb93629d4cf8e135448885483613385481cdaa PACKAGES_EULENFUNK_COMMIT=a4be61c88e4628d3f039510c86cd20fe7f417261 PACKAGES_SSIDCHANGER_COMMIT=c6dc54f7d42f0871372df4dbbbe0dfffe7d56c51 PACKAGES_ROAMGUIDE_COMMIT=491e2acb48e72ae4d0d22476efa51eb6c0c7970b +PACKAGES_ALT_COMMIT=796302e274495564549fd43a237552f992fd51df # the branch to check out PACKAGES_FFKI_BRANCH=lede PACKAGES_EULENFUNK_BRANCH=lede PACKAGES_SSIDCHANGER_BRANCH=lede PACKAGES_ROAMGUIDE_BRANCH=lede +PACKAGES_ALT_BRANCH=master diff --git a/site.mk b/site.mk index bd29c2177c9fcc11c7b974fbc8587a96058da77a..576b0642b8565abbbf3306acaec36e47148a6938 100644 --- a/site.mk +++ b/site.mk @@ -38,10 +38,15 @@ GLUON_SITE_PACKAGES += \ gluon-config-mode-ppa \ gluon-config-mode-hostname-no-pretty +# from T-X alt-esc package: +GLUON_SITE_PACKAGES += \ + gluon-alt-esc-client \ + gluon-alt-esc-provider + # Always call `make` from the command line with the desired release version! # otherwise this is generated: #DEFAULT_GLUON_RELEASE := 2017.1.3~exp$(shell date '+%y%m%d%H%M') -DEFAULT_GLUON_RELEASE := 2017.1.3 +DEFAULT_GLUON_RELEASE := 2017.1.3~exp # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)