changed site-select extensions to .json

2016-05-28 20:51:49 +02:00 · 2016-05-28 20:51:49 +02:00 · 1a687d8d29
commit 1a687d8d29
parent 9453fcac49
4 changed files with 3 additions and 3 deletions
--- a/4
+++ b/4
@ -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} \
--- a/extra/ffrgb.json
+++ b/extra/ffrgb.json
--- a/extra/ffrgb_umland.json
+++ b/extra/ffrgb_umland.json
--- a/2
+++ b/2
@ -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