migrated to gluon 2016.2, removed banner, kept ath fix

This commit is contained in:
Bastian 2016-10-21 13:07:36 +02:00
parent 1e79b0c2e3
commit 1e9839555c
3 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
GLUON_BUILD_DIR := gluon-build GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
GLUON_GIT_REF := v2016.1.5 GLUON_GIT_REF := v2016.2
#https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43 #https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43
@ -27,7 +27,7 @@ JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
#JOBS = 1 #JOBS = 1
GLUON_MAKE := ${MAKE} BROKEN=1 -j ${JOBS} -C ${GLUON_BUILD_DIR} \ GLUON_MAKE := ${MAKE} BROKEN=0 -j ${JOBS} -C ${GLUON_BUILD_DIR} \
GLUON_RELEASE=${GLUON_RELEASE} \ GLUON_RELEASE=${GLUON_RELEASE} \
GLUON_BRANCH=${GLUON_BRANCH} \ GLUON_BRANCH=${GLUON_BRANCH} \

View File

@ -1,4 +1,4 @@
GLUON_SITE_FEEDS='ffrgb banner' GLUON_SITE_FEEDS='ffrgb'
PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git
PACKAGES_FFRGB_BRANCH=master PACKAGES_FFRGB_BRANCH=master
PACKAGES_FFRGB_COMMIT=c9e25956356918d1e91f7e2b8fc716f8b07a789f PACKAGES_FFRGB_COMMIT=c9e25956356918d1e91f7e2b8fc716f8b07a789f

View File

@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \
gluon-ebtables-filter-arp-ffmuc \ gluon-ebtables-filter-arp-ffmuc \
gluon-ebtables-filter-multicast-ffmuc \ gluon-ebtables-filter-multicast-ffmuc \
gluon-ssid-changer \ gluon-ssid-changer \
gluon-banner \ # gluon-banner \
tecff-ath9k-broken-wifi-workaround tecff-ath9k-broken-wifi-workaround
# gluon-config-mode-site-select # gluon-config-mode-site-select