From 1e9839555cd65ce3baf0878d0c563a7de4379157 Mon Sep 17 00:00:00 2001 From: Bastian Date: Fri, 21 Oct 2016 13:07:36 +0200 Subject: [PATCH] migrated to gluon 2016.2, removed banner, kept ath fix --- Makefile | 4 ++-- modules | 2 +- site.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0d35371..35e3b5c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build 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 @@ -27,7 +27,7 @@ JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) #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_BRANCH=${GLUON_BRANCH} \ diff --git a/modules b/modules index b38b3f8..67e5535 100644 --- a/modules +++ b/modules @@ -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_BRANCH=master PACKAGES_FFRGB_COMMIT=c9e25956356918d1e91f7e2b8fc716f8b07a789f diff --git a/site.mk b/site.mk index cad9893..58f3f28 100644 --- a/site.mk +++ b/site.mk @@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \ gluon-ebtables-filter-arp-ffmuc \ gluon-ebtables-filter-multicast-ffmuc \ gluon-ssid-changer \ - gluon-banner \ +# gluon-banner \ tecff-ath9k-broken-wifi-workaround # gluon-config-mode-site-select