From d3a0470bfb909a798685ff9872d39e24736284cf Mon Sep 17 00:00:00 2001 From: lephisto Date: Wed, 20 May 2015 16:35:42 +0200 Subject: [PATCH 1/2] Create modules geborgt vom ffmuc :) --- modules | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 modules diff --git a/modules b/modules new file mode 100644 index 0000000..bf79c5e --- /dev/null +++ b/modules @@ -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 From fb5a466391cae61ee084407b849b1874da882ae9 Mon Sep 17 00:00:00 2001 From: Bastian Date: Wed, 20 May 2015 17:16:29 +0200 Subject: [PATCH 2/2] hardcoded jobs=1, otherwise build will fail --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 9d7bc61..3c14f8f 100644 --- a/Makefile +++ b/Makefile @@ -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}