diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-17 21:40:24 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-17 21:40:24 +0000 |
| commit | 8bc61c54fdac2884d23ae3802afe7f5f81c7aff2 (patch) | |
| tree | 131c8ed3980b6aa897fcb471314cfa01ae2193dd /conf | |
| parent | 94d87cd53a89e085b09ca55c1bc05a7c313998e8 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/01/17 22:09:22+01:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/openembedded
2005/01/17 22:08:56+01:00 handhelds.org!zecke
UICMOC use Qt2.3.9:
-Use recent Qt2.3.9 for building uicmoc
-Update patches to work with Qt2.3.9 version
2005/01/17 22:07:14+01:00 handhelds.org!zecke
Qt 2.3.9:
-Update to 14.01.2005 snapshot
-TSlib patch is included but castrated, uncastrate it
-The latest mouse release patch was fixed independently by Trolltech as well
-Update other patches
2005/01/17 16:00:45-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded
2005/01/17 15:56:11-05:00 handhelds.org!kergoth
Update the default event handler to clean things up a bit, and to mention the package version in the Pkg events, which people have requested in the past.
2005/01/17 20:49:43+00:00 rpsys.net!RP
Add facility to pass parallel build option to make. Disable parallel build option for known broken packages.
BKrev: 41ec30c8I5e1Ks5lsaghKSnrJo6cVg
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 3 | ||||
| -rw-r--r-- | conf/local.conf.sample | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index a8c73120fd..5fa8bb0d38 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -239,6 +239,9 @@ export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ # Which flags to leave by strip-flags() in bin/build/oebuild.sh ? ALLOWED_FLAGS = "-O -mcpu -march -pipe" +# Pass parallel make options to the compile task only +EXTRA_OEMAKE_prepend_task_do_compile = "${PARALLEL_MAKE} " + ################################################################## # Optimization flags. ################################################################## diff --git a/conf/local.conf.sample b/conf/local.conf.sample index cb2b367db5..35ec6e8d50 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -97,6 +97,12 @@ IMAGE_FSTYPES = "jffs2 tar" # SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}" # LDFLAGS =+ "-pg" +# Uncomment this to enable parallel make. +# This allows make to spawn mutliple processes to take advantage of multiple +# processors. Useful on SMP machines. This may break some packages - we're +# in the process of marking these so let us know if you find any. +# PARALLEL_MAKE = "-j 4" + # Uncomment this if you want BitBake to emit the log if a build fails. BBINCLUDELOGS = "yes" |