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 --- bitbake/lib/bb/parse/__init__.py | 4 +++ bitbake/lib/bb/parse/parse_py/BBHandler.py | 6 ++-- build/conf/local.conf.sample | 44 ++++++++++++----------- handbook/faq.xml | 18 ++++++++++ handbook/introduction.xml | 11 ++++-- handbook/ref-variables.xml | 17 ++++++++- meta/conf/distro/include/poky-eabi.inc | 1 + meta/conf/distro/include/poky-fixed-revisions.inc | 6 ++-- 8 files changed, 77 insertions(+), 30 deletions(-) diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py index 3c9ba8e6da..5dd96c4136 100644 --- a/bitbake/lib/bb/parse/__init__.py +++ b/bitbake/lib/bb/parse/__init__.py @@ -50,6 +50,10 @@ def cached_mtime_noerror(f): return 0 return __mtime_cache[f] +def update_mtime(f): + __mtime_cache[f] = os.stat(f)[8] + return __mtime_cache[f] + def mark_dependency(d, f): if f.startswith('./'): f = "%s/%s" % (os.getcwd(), f[2:]) diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index d7bf6d4f37..cc8bc92e1d 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -122,8 +122,10 @@ def handle(fn, d, include = 0): abs_fn = fn if ext != ".bbclass": - bbpath.insert(0, os.path.dirname(abs_fn)) - data.setVar('BBPATH', ":".join(bbpath), d) + dname = os.path.dirname(abs_fn) + if bbpath[0] != dname: + bbpath.insert(0, dname) + data.setVar('BBPATH', ":".join(bbpath), d) if include: bb.parse.mark_dependency(d, abs_fn) 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" diff --git a/handbook/faq.xml b/handbook/faq.xml index 061ed563ce..4bd1b7a493 100644 --- a/handbook/faq.xml +++ b/handbook/faq.xml @@ -226,6 +226,24 @@ + + + + I'm behind a firewall and need to use a proxy server. How do I do that? + + + + + Most source fetching by Poky is done by wget and you therefore need to specify the proxy + settings in a .wgetrc file in your home directory. Example settings in that file would be + 'http_proxy = http://proxy.yoyodyne.com:18023/' and 'ftp_proxy = http://proxy.yoyodyne.com:18023/'. + Poky also includes a site.conf.sample file which shows how to configure cvs and git proxy servers + if needed. + + + + +