From 176d7e01e08651202f1c425b6d894964dcfe5c2a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 14 Jun 2015 01:47:06 +0200 Subject: [PATCH 1/4] Makefile: Remove JOBS option --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f3ab844..d897d4a 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,7 @@ else GLUON_BRANCH := experimental endif -JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) - -GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \ +GLUON_MAKE := ${MAKE} -C ${GLUON_BUILD_DIR} \ GLUON_RELEASE=${GLUON_RELEASE} \ GLUON_BRANCH=${GLUON_BRANCH} From 19f756d0f1c41eb800d4efaadd95d17951e94406 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 14 Jun 2015 01:47:17 +0200 Subject: [PATCH 2/4] Switch to our gluon for for RA filtering --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d897d4a..12b2d0a 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 := v2015.1 +GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git +GLUON_GIT_REF := a73bd923c8bfcd0a9e3908f4395013cb70f2954c SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 8071f239c23dee886bb045b2a8a80d7907efddc8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 14 Jun 2015 13:21:14 +0200 Subject: [PATCH 3/4] Update gluon git ref --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 12b2d0a..71a0213 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git -GLUON_GIT_REF := a73bd923c8bfcd0a9e3908f4395013cb70f2954c +GLUON_GIT_REF := c4818e59315e8df4aa7ecbe0a4d26b8112b6f490 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From fdc9a140427202c133bda1f8cc9bee2ef3cb947b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 14 Jun 2015 13:59:48 +0200 Subject: [PATCH 4/4] Update gluon to fix openssl tarball fetching --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 71a0213..f5df139 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git -GLUON_GIT_REF := c4818e59315e8df4aa7ecbe0a4d26b8112b6f490 +GLUON_GIT_REF := 620f01f513012757a66d782ef0e930245fcdc1e8 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key