sprinterfreak/site-ffrgb-dev
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6 from ffrgb/master

Browse Source 
merge to master..
This commit is contained in:
Bastian 2015-05-21 15:38:32 +02:00
commit 6d11c69920
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -18,6 +18,8 @@ endif
JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
JOBS = 1
GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \ GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
GLUON_RELEASE=${GLUON_RELEASE} \ GLUON_RELEASE=${GLUON_RELEASE} \
GLUON_BRANCH=${GLUON_BRANCH} GLUON_BRANCH=${GLUON_BRANCH}

3
modules Normal file
View File

@ -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