Merge pull request #6 from ffrgb/master

merge to master..
2015-05-21 15:38:32 +02:00 · 2015-05-21 15:38:32 +02:00 · 6d11c69920
commit 6d11c69920
parent 9114f05e49 fb5a466391
2 changed files with 5 additions and 0 deletions
--- a/2
+++ b/2
@ -18,6 +18,8 @@ endif

 JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)

+JOBS = 1
+
 GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
 			GLUON_RELEASE=${GLUON_RELEASE} \
 			GLUON_BRANCH=${GLUON_BRANCH}
--- a/3
+++ b/3
@ -0,0 +1,3 @@
+GLUON_SITE_FEEDS='ffmuc_packages'
+PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git
+PACKAGES_FFMUC_PACKAGES_COMMIT=82e721ad5d7c9eca8728954cfa1ab1d5b9168487