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
2025-07-05 05:04:44 +02:00 · 2008-09-26 08:58:28 +00:00 · 2008-09-26 08:58:28 +00:00 · cd8b52418c
commit cd8b52418c
parent 75f3f9bb6d
8 changed files with 77 additions and 30 deletions
--- 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:])
--- 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)
--- 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"
 # <build directory>/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"
--- a/handbook/faq.xml
+++ b/handbook/faq.xml
@ -226,6 +226,24 @@
            </para>
        </answer>
    </qandaentry>
+    <qandaentry>
+        <question>
+            <para>
+                I'm behind a firewall and need to use a proxy server. How do I do that?
+            </para>
+        </question>
+        <answer>
+            <para>
+                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.
+            </para>
+        </answer>
+    </qandaentry>
+
+
 </qandaset>
 </appendix>
 <!-- 
--- a/handbook/introduction.xml
+++ b/handbook/introduction.xml
@ -196,9 +196,14 @@ $ runqemu qemuarm

        <para>
            To build for other machines see the <glossterm><link
-                    linkend='var-MACHINE'>MACHINE</link></glossterm> variable in build/conf/local.conf
-            which also contains other configuration information. The images/kernels built
-            by Poky are placed in the <filename class="directory">tmp/deploy/images</filename>
+                    linkend='var-MACHINE'>MACHINE</link></glossterm> variable in build/conf/local.conf.
+            This file contains other useful configuration information and the default version
+            has examples of common setup needs and is worth 
+            reading. To take advantage of multiple processor cores to speed up builds for example, set the 
+            <glossterm><link linkend='var-BB_NUMBER_THREADS'>BB_NUMBER_THREADS</link></glossterm>
+            and <glossterm><link linkend='var-PARALLEL_MAKE'>PARALLEL_MAKE</link></glossterm> variables.
+
+            The images/kernels built by Poky are placed in the <filename class="directory">tmp/deploy/images</filename>
            directory.
        </para>

--- a/handbook/ref-variables.xml
+++ b/handbook/ref-variables.xml
@ -66,7 +66,7 @@

        <glossentry id='var-BB_NUMBER_THREADS'><glossterm>BB_NUMBER_THREADS</glossterm>
            <glossdef>
-                <para>Number of BitBake threads</para>
+                <para>The maximum number of tasks BitBake should run in parallel at any one time</para>
            </glossdef>
        </glossentry>

@ -483,6 +483,14 @@
            </glossdef>
        </glossentry>

+        <glossentry id='var-PARALLEL_MAKE'><glossterm>PARALLEL_MAKE</glossterm>
+            <glossdef>
+                <para>Extra options that are passed to the make command during the 
+                    compile tasks. This is usually of the form '-j 4' where the number
+                    represents the maximum number of parallel threads make can run.</para>
+            </glossdef>
+        </glossentry>
+
        <glossentry id='var-PN'><glossterm>PN</glossterm>
            <glossdef>
                <para>Name of package.
@ -532,6 +540,13 @@
            </glossdef>
        </glossentry>

+        <glossentry id='var-POKY_EXTRA_INSTALL'><glossterm>POKY_EXTRA_INSTALL</glossterm>
+            <glossdef>
+                <para>List of packages to be added to the image. This should
+                only be set in <filename>local.conf</filename>.</para>
+            </glossdef>
+        </glossentry>
+
        <glossentry id='var-POKYLIBC'><glossterm>POKYLIBC</glossterm>
            <glossdef>
                <para>Libc implementation selector - glibc or uclibc can be selected.</para>
--- a/meta/conf/distro/include/poky-eabi.inc
+++ b/meta/conf/distro/include/poky-eabi.inc
@ -42,5 +42,6 @@ ASNEEDED_pn-xserver-kdrive-xomap = ""
 ASNEEDED_pn-minimo = ""
 ASNEEDED_pn-pciutils = ""
 ASNEEDED_pn-puzzles = ""
+ASNEEDED_pn-dialer = ""

 TARGET_LDFLAGS += "${ASNEEDED}"
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@ -37,7 +37,7 @@ SRCREV_pn-gtk-theme-torturer ?= "99962ae39bb5aadb31929b25c58e1a053f9c9545"
 SRCREV_pn-gypsy ?= "147"
 SRCREV_pn-libfakekey ?= "2031"
 SRCREV_pn-libgsmd ?= "4335"
-SRCREV_pn-libowl ?= "354"
+SRCREV_pn-libowl ?= "408"
 SRCREV_pn-libsyncml ?= "241"
 PV_pn-libxcalibrate ?= "0.0-poky1-${SRCREV}"
 SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
@ -46,7 +46,7 @@ SRCREV_pn-matchbox-applet-light ?= "1548"
 SRCREV_pn-matchbox-common ?= "1561"
 SRCREV_pn-matchbox-config-gtk ?= "1614"
 SRCREV_pn-matchbox-desktop-sato ?= "76"
-SRCREV_pn-matchbox-desktop ?= "2066"
+SRCREV_pn-matchbox-desktop ?= "2077"
 SRCREV_pn-matchbox-keyboard ?= "1910"
 SRCREV_pn-matchbox-panel-2 ?= "2061"
 SRCREV_pn-matchbox-panel ?= "1364"
@ -55,7 +55,7 @@ SRCREV_pn-matchbox-terminal ?= "1612"
 SRCREV_pn-matchbox-theme-sato-2 ?= "94"
 SRCREV_pn-matchbox-theme-sato ?= "90"
 SRCREV_pn-matchbox-themes-extra ?= "1524"
-SRCREV_pn-matchbox-wm-2 ?= "2073"
+SRCREV_pn-matchbox-wm-2 ?= "2074"
 SRCREV_pn-matchbox-wm ?= "1524"
 SRCREV_pn-oh-puzzles ?= "23"
 SRCREV_pn-opkg-native ?= "4545"