From: Denys Dmytriyenko <[email protected]>

1. Unfortunately, even with memory-limiting changes in upstream, our build
   VMs sometimes can trigger OOM killer - go back to limiting threads.
2. There was no need to separate TMPDIR for now, so while the support is
   there, do not enable it by default

Signed-off-by: Denys Dmytriyenko <[email protected]>
---
 sample-files/local-arago.conf.sample   | 10 +++++-----
 sample-files/local-arago64.conf.sample | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sample-files/local-arago.conf.sample 
b/sample-files/local-arago.conf.sample
index 7c7a336..96dfaf9 100644
--- a/sample-files/local-arago.conf.sample
+++ b/sample-files/local-arago.conf.sample
@@ -49,7 +49,9 @@ SSTATE_DIR = "${OEBASE}/build/sstate-cache"
 # this includes the extraction and compilation of many applications and the 
toolchain
 # which can use Gigabytes of hard disk space.
 TMPDIR = "${TOPDIR}/arago-tmp"
-DEPLOY_DIR = "${TOPDIR}/deploy"
+
+# By default, DEPLOY_DIR is inside TMPDIR, but can be changed here to be 
outside
+#DEPLOY_DIR = "${TOPDIR}/deploy"
 
 #
 # Machine Selection
@@ -136,17 +138,15 @@ ENABLE_BINARY_LOCALE_GENERATION = "0"
 # These two options control how much parallelism BitBake should use. The first 
 # option determines how many tasks bitbake should run in parallel:
 #
-#BB_NUMBER_THREADS = "1"
+BB_NUMBER_THREADS = "1"
 # 
 # The second option controls how many processes make should run in parallel 
when
 # running compile tasks:
 #
-#PARALLEL_MAKE = "-j 1"
+PARALLEL_MAKE = "-j 1"
 #
 # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" 
would
 # be appropriate for example
-# These options don't need to be set manually, as OE will determine them 
automatically,
-# unless need to override that default.
 
 DISTRO   = "arago"
 
diff --git a/sample-files/local-arago64.conf.sample 
b/sample-files/local-arago64.conf.sample
index 1e21185..f48db77 100644
--- a/sample-files/local-arago64.conf.sample
+++ b/sample-files/local-arago64.conf.sample
@@ -49,7 +49,9 @@ SSTATE_DIR = "${OEBASE}/build/sstate-cache"
 # this includes the extraction and compilation of many applications and the 
toolchain
 # which can use Gigabytes of hard disk space.
 TMPDIR = "${TOPDIR}/arago-tmp"
-DEPLOY_DIR = "${TOPDIR}/deploy"
+
+# By default, DEPLOY_DIR is inside TMPDIR, but can be changed here to be 
outside
+#DEPLOY_DIR = "${TOPDIR}/deploy"
 
 #
 # Machine Selection
@@ -136,17 +138,15 @@ ENABLE_BINARY_LOCALE_GENERATION = "0"
 # These two options control how much parallelism BitBake should use. The first 
 # option determines how many tasks bitbake should run in parallel:
 #
-#BB_NUMBER_THREADS = "1"
+BB_NUMBER_THREADS = "1"
 # 
 # The second option controls how many processes make should run in parallel 
when
 # running compile tasks:
 #
-#PARALLEL_MAKE = "-j 1"
+PARALLEL_MAKE = "-j 1"
 #
 # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" 
would
 # be appropriate for example
-# These options don't need to be set manually, as OE will determine them 
automatically,
-# unless need to override that default.
 
 DISTRO   = "arago"
 
-- 
2.7.4

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to