From cd8b52418c475cf8708f136babb2bfa2f3b1744f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 26 Sep 2008 08:58:28 +0000 Subject: Merged revisions 5189-5198 via svnmerge from https://svn.o-hand.com/repos/poky/trunk ........ r5189 | richard | 2008-09-11 23:41:08 +0100 (Thu, 11 Sep 2008) | 1 line local.conf.sample: Make the parallel threads documentation more visible and update with a quadcore example ........ r5190 | richard | 2008-09-12 00:02:51 +0100 (Fri, 12 Sep 2008) | 1 line handbook/quickstart: Improve documentation on the options available in local.conf ........ r5191 | richard | 2008-09-12 00:11:45 +0100 (Fri, 12 Sep 2008) | 1 line handbook/faq.xml: Add a QA about proxy server setup ........ r5192 | ross | 2008-09-12 16:43:10 +0100 (Fri, 12 Sep 2008) | 1 line ref-variables.xml: Add POKY_EXTRA_INSTALL ........ r5193 | ross | 2008-09-16 10:00:50 +0100 (Tue, 16 Sep 2008) | 1 line poky-fixed-revisions.inc: bump matchbox-wm-2 ........ r5194 | ross | 2008-09-16 16:36:32 +0100 (Tue, 16 Sep 2008) | 1 line poky-fixed-revisions: bump libowl srvrev ........ r5195 | ross | 2008-09-16 17:24:31 +0100 (Tue, 16 Sep 2008) | 1 line poky-fixed-revisions.inc: bump matchbox-desktop srvrev ........ r5196 | richard | 2008-09-16 20:14:49 +0100 (Tue, 16 Sep 2008) | 1 line bitbake parse/__init_.py: Add missing update_mtime function fixing bitbake shell reparse failures ........ r5197 | richard | 2008-09-16 21:09:03 +0100 (Tue, 16 Sep 2008) | 1 line ConfHandler.py: revert accidental commit ........ r5198 | ross | 2008-09-18 10:35:14 +0100 (Thu, 18 Sep 2008) | 1 line poky-eabi.conf: add dialer to as-needed blacklist ........ git-svn-id: https://svn.o-hand.com/repos/poky/branches/elroy@5284 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- build/conf/local.conf.sample | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'build/conf/local.conf.sample') diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample index c8ba7553bf..4d78368511 100644 --- a/build/conf/local.conf.sample +++ b/build/conf/local.conf.sample @@ -2,22 +2,12 @@ DL_DIR ?= "${OEROOT}/sources" BBFILES = "${OEROOT}/meta/packages/*/*.bb" -# Poky has various extra metadata collections (openmoko, extras). -# To enable these, uncomment all (or some of) the following lines: -# BBFILES = "\ -# ${OEROOT}/meta/packages/*/*.bb -# ${OEROOT}/meta-extras/packages/*/*.bb -# ${OEROOT}/meta-openmoko/packages/*/*.bb -# " -# BBFILE_COLLECTIONS = "normal extras openmoko" -# BBFILE_PATTERN_normal = "^${OEROOT}/meta/" -# BBFILE_PATTERN_extras = "^${OEROOT}/meta-extras/" -# BBFILE_PATTERN_openmoko = "^${OEROOT}/meta-openmoko/" -# BBFILE_PRIORITY_normal = "5" -# BBFILE_PRIORITY_extras = "5" -# BBFILE_PRIORITY_openmoko = "5" - -BBMASK = "" +# Uncomment and set to allow bitbake to execute multiple tasks at once. +# For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would +# be appropriate. +# BB_NUMBER_THREADS = "4" +# Also, make can be passed flags so it run parallel threads e.g.: +# PARALLEL_MAKE = "-j 4" # The machine to target MACHINE ?= "qemuarm" @@ -43,6 +33,23 @@ DISTRO ?= "poky" # For bleeding edge / experimental / unstable package versions # DISTRO ?= "poky-bleeding" +# Poky has various extra metadata collections (openmoko, extras). +# To enable these, uncomment all (or some of) the following lines: +# BBFILES = "\ +# ${OEROOT}/meta/packages/*/*.bb +# ${OEROOT}/meta-extras/packages/*/*.bb +# ${OEROOT}/meta-openmoko/packages/*/*.bb +# " +# BBFILE_COLLECTIONS = "normal extras openmoko" +# BBFILE_PATTERN_normal = "^${OEROOT}/meta/" +# BBFILE_PATTERN_extras = "^${OEROOT}/meta-extras/" +# BBFILE_PATTERN_openmoko = "^${OEROOT}/meta-openmoko/" +# BBFILE_PRIORITY_normal = "5" +# BBFILE_PRIORITY_extras = "5" +# BBFILE_PRIORITY_openmoko = "5" + +BBMASK = "" + # EXTRA_IMAGE_FEATURES allows extra packages to be added to the generated images # (Some of these are automatically added to certain image types) # "dbg-pkgs" - add -dbg packages for all installed packages @@ -92,11 +99,6 @@ PACKAGE_CLASSES ?= "package_ipk" # /tmp TMPDIR = "${OEROOT}/build/tmp" -# Uncomment and set to allow bitbake to execute multiple tasks at once. -# Note, This option is currently experimental - YMMV. -# BB_NUMBER_THREADS = "1" -# Also, make can be passed flags so it run parallel threads e.g.: -# PARALLEL_MAKE = "-j 4" # Uncomment this if you are using the Openedhand provided qemu deb - see README # ASSUME_PROVIDED += "qemu-native" -- cgit v1.2.3-54-g00ecf