From 1a687d8d29bda32a23f2cef44c3e2e46609bf2a4 Mon Sep 17 00:00:00 2001
From: Bastian <mephisto@mephis.to>
Date: Sat, 28 May 2016 20:51:49 +0200
Subject: [PATCH] changed site-select extensions to .json

---
 Makefile                                       | 4 ++--
 extra/{ffrgb.conf => ffrgb.json}               | 0
 extra/{ffrgb_umland.conf => ffrgb_umland.json} | 0
 modules                                        | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename extra/{ffrgb.conf => ffrgb.json} (100%)
 rename extra/{ffrgb_umland.conf => ffrgb_umland.json} (100%)

diff --git a/Makefile b/Makefile
index 9455882..9fbad94 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 := 80d5f5f995f131ce1444587318e544bfca337b0d
+GLUON_GIT_REF := 6899e50c97b34976fcb7d627062e6effa8078067
 
 #https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43
 
@@ -22,7 +22,7 @@ endif
 
 JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
 
-#JOBS = 1
+JOBS = 1
 
 GLUON_MAKE := ${MAKE} V=s -j ${JOBS} -C ${GLUON_BUILD_DIR} \
 			GLUON_RELEASE=${GLUON_RELEASE} \
diff --git a/extra/ffrgb.conf b/extra/ffrgb.json
similarity index 100%
rename from extra/ffrgb.conf
rename to extra/ffrgb.json
diff --git a/extra/ffrgb_umland.conf b/extra/ffrgb_umland.json
similarity index 100%
rename from extra/ffrgb_umland.conf
rename to extra/ffrgb_umland.json
diff --git a/modules b/modules
index 78c7cb1..586d625 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,4 @@
 GLUON_SITE_FEEDS='ffrgb'
 PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git
 PACKAGES_FFRGB_BRANCH=master
-PACKAGES_FFRGB_COMMIT=c7968bfedb86ee8d7b5e80405095bcb199ef508c
+PACKAGES_FFRGB_COMMIT=68f1139ad72ce1a50320eee02aa6797967b9c214