diff options
author | Ross Burton <ross@openedhand.com> | 2008-09-26 08:58:28 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2008-09-26 08:58:28 +0000 |
commit | cd8b52418c475cf8708f136babb2bfa2f3b1744f (patch) | |
tree | 5733077975e7d4f0e7efbd89207d8f7d2268287a | |
parent | 75f3f9bb6d823faec884569400f9dcb6c28ef732 (diff) | |
download | poky-cd8b52418c475cf8708f136babb2bfa2f3b1744f.tar.gz |
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
-rw-r--r-- | bitbake/lib/bb/parse/__init__.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 6 | ||||
-rw-r--r-- | build/conf/local.conf.sample | 44 | ||||
-rw-r--r-- | handbook/faq.xml | 18 | ||||
-rw-r--r-- | handbook/introduction.xml | 11 | ||||
-rw-r--r-- | handbook/ref-variables.xml | 17 | ||||
-rw-r--r-- | meta/conf/distro/include/poky-eabi.inc | 1 | ||||
-rw-r--r-- | 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): | |||
50 | return 0 | 50 | return 0 |
51 | return __mtime_cache[f] | 51 | return __mtime_cache[f] |
52 | 52 | ||
53 | def update_mtime(f): | ||
54 | __mtime_cache[f] = os.stat(f)[8] | ||
55 | return __mtime_cache[f] | ||
56 | |||
53 | def mark_dependency(d, f): | 57 | def mark_dependency(d, f): |
54 | if f.startswith('./'): | 58 | if f.startswith('./'): |
55 | f = "%s/%s" % (os.getcwd(), f[2:]) | 59 | 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): | |||
122 | abs_fn = fn | 122 | abs_fn = fn |
123 | 123 | ||
124 | if ext != ".bbclass": | 124 | if ext != ".bbclass": |
125 | bbpath.insert(0, os.path.dirname(abs_fn)) | 125 | dname = os.path.dirname(abs_fn) |
126 | data.setVar('BBPATH', ":".join(bbpath), d) | 126 | if bbpath[0] != dname: |
127 | bbpath.insert(0, dname) | ||
128 | data.setVar('BBPATH', ":".join(bbpath), d) | ||
127 | 129 | ||
128 | if include: | 130 | if include: |
129 | bb.parse.mark_dependency(d, abs_fn) | 131 | 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 @@ | |||
2 | DL_DIR ?= "${OEROOT}/sources" | 2 | DL_DIR ?= "${OEROOT}/sources" |
3 | BBFILES = "${OEROOT}/meta/packages/*/*.bb" | 3 | BBFILES = "${OEROOT}/meta/packages/*/*.bb" |
4 | 4 | ||
5 | # Poky has various extra metadata collections (openmoko, extras). | 5 | # Uncomment and set to allow bitbake to execute multiple tasks at once. |
6 | # To enable these, uncomment all (or some of) the following lines: | 6 | # For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would |
7 | # BBFILES = "\ | 7 | # be appropriate. |
8 | # ${OEROOT}/meta/packages/*/*.bb | 8 | # BB_NUMBER_THREADS = "4" |
9 | # ${OEROOT}/meta-extras/packages/*/*.bb | 9 | # Also, make can be passed flags so it run parallel threads e.g.: |
10 | # ${OEROOT}/meta-openmoko/packages/*/*.bb | 10 | # PARALLEL_MAKE = "-j 4" |
11 | # " | ||
12 | # BBFILE_COLLECTIONS = "normal extras openmoko" | ||
13 | # BBFILE_PATTERN_normal = "^${OEROOT}/meta/" | ||
14 | # BBFILE_PATTERN_extras = "^${OEROOT}/meta-extras/" | ||
15 | # BBFILE_PATTERN_openmoko = "^${OEROOT}/meta-openmoko/" | ||
16 | # BBFILE_PRIORITY_normal = "5" | ||
17 | # BBFILE_PRIORITY_extras = "5" | ||
18 | # BBFILE_PRIORITY_openmoko = "5" | ||
19 | |||
20 | BBMASK = "" | ||
21 | 11 | ||
22 | # The machine to target | 12 | # The machine to target |
23 | MACHINE ?= "qemuarm" | 13 | MACHINE ?= "qemuarm" |
@@ -43,6 +33,23 @@ DISTRO ?= "poky" | |||
43 | # For bleeding edge / experimental / unstable package versions | 33 | # For bleeding edge / experimental / unstable package versions |
44 | # DISTRO ?= "poky-bleeding" | 34 | # DISTRO ?= "poky-bleeding" |
45 | 35 | ||
36 | # Poky has various extra metadata collections (openmoko, extras). | ||
37 | # To enable these, uncomment all (or some of) the following lines: | ||
38 | # BBFILES = "\ | ||
39 | # ${OEROOT}/meta/packages/*/*.bb | ||
40 | # ${OEROOT}/meta-extras/packages/*/*.bb | ||
41 | # ${OEROOT}/meta-openmoko/packages/*/*.bb | ||
42 | # " | ||
43 | # BBFILE_COLLECTIONS = "normal extras openmoko" | ||
44 | # BBFILE_PATTERN_normal = "^${OEROOT}/meta/" | ||
45 | # BBFILE_PATTERN_extras = "^${OEROOT}/meta-extras/" | ||
46 | # BBFILE_PATTERN_openmoko = "^${OEROOT}/meta-openmoko/" | ||
47 | # BBFILE_PRIORITY_normal = "5" | ||
48 | # BBFILE_PRIORITY_extras = "5" | ||
49 | # BBFILE_PRIORITY_openmoko = "5" | ||
50 | |||
51 | BBMASK = "" | ||
52 | |||
46 | # EXTRA_IMAGE_FEATURES allows extra packages to be added to the generated images | 53 | # EXTRA_IMAGE_FEATURES allows extra packages to be added to the generated images |
47 | # (Some of these are automatically added to certain image types) | 54 | # (Some of these are automatically added to certain image types) |
48 | # "dbg-pkgs" - add -dbg packages for all installed packages | 55 | # "dbg-pkgs" - add -dbg packages for all installed packages |
@@ -92,11 +99,6 @@ PACKAGE_CLASSES ?= "package_ipk" | |||
92 | # <build directory>/tmp | 99 | # <build directory>/tmp |
93 | TMPDIR = "${OEROOT}/build/tmp" | 100 | TMPDIR = "${OEROOT}/build/tmp" |
94 | 101 | ||
95 | # Uncomment and set to allow bitbake to execute multiple tasks at once. | ||
96 | # Note, This option is currently experimental - YMMV. | ||
97 | # BB_NUMBER_THREADS = "1" | ||
98 | # Also, make can be passed flags so it run parallel threads e.g.: | ||
99 | # PARALLEL_MAKE = "-j 4" | ||
100 | 102 | ||
101 | # Uncomment this if you are using the Openedhand provided qemu deb - see README | 103 | # Uncomment this if you are using the Openedhand provided qemu deb - see README |
102 | # ASSUME_PROVIDED += "qemu-native" | 104 | # 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 @@ | |||
226 | </para> | 226 | </para> |
227 | </answer> | 227 | </answer> |
228 | </qandaentry> | 228 | </qandaentry> |
229 | <qandaentry> | ||
230 | <question> | ||
231 | <para> | ||
232 | I'm behind a firewall and need to use a proxy server. How do I do that? | ||
233 | </para> | ||
234 | </question> | ||
235 | <answer> | ||
236 | <para> | ||
237 | Most source fetching by Poky is done by wget and you therefore need to specify the proxy | ||
238 | settings in a .wgetrc file in your home directory. Example settings in that file would be | ||
239 | 'http_proxy = http://proxy.yoyodyne.com:18023/' and 'ftp_proxy = http://proxy.yoyodyne.com:18023/'. | ||
240 | Poky also includes a site.conf.sample file which shows how to configure cvs and git proxy servers | ||
241 | if needed. | ||
242 | </para> | ||
243 | </answer> | ||
244 | </qandaentry> | ||
245 | |||
246 | |||
229 | </qandaset> | 247 | </qandaset> |
230 | </appendix> | 248 | </appendix> |
231 | <!-- | 249 | <!-- |
diff --git a/handbook/introduction.xml b/handbook/introduction.xml index 291ed5d214..7de74673fb 100644 --- a/handbook/introduction.xml +++ b/handbook/introduction.xml | |||
@@ -196,9 +196,14 @@ $ runqemu qemuarm | |||
196 | 196 | ||
197 | <para> | 197 | <para> |
198 | To build for other machines see the <glossterm><link | 198 | To build for other machines see the <glossterm><link |
199 | linkend='var-MACHINE'>MACHINE</link></glossterm> variable in build/conf/local.conf | 199 | linkend='var-MACHINE'>MACHINE</link></glossterm> variable in build/conf/local.conf. |
200 | which also contains other configuration information. The images/kernels built | 200 | This file contains other useful configuration information and the default version |
201 | by Poky are placed in the <filename class="directory">tmp/deploy/images</filename> | 201 | has examples of common setup needs and is worth |
202 | reading. To take advantage of multiple processor cores to speed up builds for example, set the | ||
203 | <glossterm><link linkend='var-BB_NUMBER_THREADS'>BB_NUMBER_THREADS</link></glossterm> | ||
204 | and <glossterm><link linkend='var-PARALLEL_MAKE'>PARALLEL_MAKE</link></glossterm> variables. | ||
205 | |||
206 | The images/kernels built by Poky are placed in the <filename class="directory">tmp/deploy/images</filename> | ||
202 | directory. | 207 | directory. |
203 | </para> | 208 | </para> |
204 | 209 | ||
diff --git a/handbook/ref-variables.xml b/handbook/ref-variables.xml index a3590e1072..5d821a2108 100644 --- a/handbook/ref-variables.xml +++ b/handbook/ref-variables.xml | |||
@@ -66,7 +66,7 @@ | |||
66 | 66 | ||
67 | <glossentry id='var-BB_NUMBER_THREADS'><glossterm>BB_NUMBER_THREADS</glossterm> | 67 | <glossentry id='var-BB_NUMBER_THREADS'><glossterm>BB_NUMBER_THREADS</glossterm> |
68 | <glossdef> | 68 | <glossdef> |
69 | <para>Number of BitBake threads</para> | 69 | <para>The maximum number of tasks BitBake should run in parallel at any one time</para> |
70 | </glossdef> | 70 | </glossdef> |
71 | </glossentry> | 71 | </glossentry> |
72 | 72 | ||
@@ -483,6 +483,14 @@ | |||
483 | </glossdef> | 483 | </glossdef> |
484 | </glossentry> | 484 | </glossentry> |
485 | 485 | ||
486 | <glossentry id='var-PARALLEL_MAKE'><glossterm>PARALLEL_MAKE</glossterm> | ||
487 | <glossdef> | ||
488 | <para>Extra options that are passed to the make command during the | ||
489 | compile tasks. This is usually of the form '-j 4' where the number | ||
490 | represents the maximum number of parallel threads make can run.</para> | ||
491 | </glossdef> | ||
492 | </glossentry> | ||
493 | |||
486 | <glossentry id='var-PN'><glossterm>PN</glossterm> | 494 | <glossentry id='var-PN'><glossterm>PN</glossterm> |
487 | <glossdef> | 495 | <glossdef> |
488 | <para>Name of package. | 496 | <para>Name of package. |
@@ -532,6 +540,13 @@ | |||
532 | </glossdef> | 540 | </glossdef> |
533 | </glossentry> | 541 | </glossentry> |
534 | 542 | ||
543 | <glossentry id='var-POKY_EXTRA_INSTALL'><glossterm>POKY_EXTRA_INSTALL</glossterm> | ||
544 | <glossdef> | ||
545 | <para>List of packages to be added to the image. This should | ||
546 | only be set in <filename>local.conf</filename>.</para> | ||
547 | </glossdef> | ||
548 | </glossentry> | ||
549 | |||
535 | <glossentry id='var-POKYLIBC'><glossterm>POKYLIBC</glossterm> | 550 | <glossentry id='var-POKYLIBC'><glossterm>POKYLIBC</glossterm> |
536 | <glossdef> | 551 | <glossdef> |
537 | <para>Libc implementation selector - glibc or uclibc can be selected.</para> | 552 | <para>Libc implementation selector - glibc or uclibc can be selected.</para> |
diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc index 135012404c..c3d6383c51 100644 --- 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 = "" | |||
42 | ASNEEDED_pn-minimo = "" | 42 | ASNEEDED_pn-minimo = "" |
43 | ASNEEDED_pn-pciutils = "" | 43 | ASNEEDED_pn-pciutils = "" |
44 | ASNEEDED_pn-puzzles = "" | 44 | ASNEEDED_pn-puzzles = "" |
45 | ASNEEDED_pn-dialer = "" | ||
45 | 46 | ||
46 | TARGET_LDFLAGS += "${ASNEEDED}" | 47 | TARGET_LDFLAGS += "${ASNEEDED}" |
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index 322b822fdd..59dd6cebdc 100644 --- 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" | |||
37 | SRCREV_pn-gypsy ?= "147" | 37 | SRCREV_pn-gypsy ?= "147" |
38 | SRCREV_pn-libfakekey ?= "2031" | 38 | SRCREV_pn-libfakekey ?= "2031" |
39 | SRCREV_pn-libgsmd ?= "4335" | 39 | SRCREV_pn-libgsmd ?= "4335" |
40 | SRCREV_pn-libowl ?= "354" | 40 | SRCREV_pn-libowl ?= "408" |
41 | SRCREV_pn-libsyncml ?= "241" | 41 | SRCREV_pn-libsyncml ?= "241" |
42 | PV_pn-libxcalibrate ?= "0.0-poky1-${SRCREV}" | 42 | PV_pn-libxcalibrate ?= "0.0-poky1-${SRCREV}" |
43 | SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" | 43 | SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" |
@@ -46,7 +46,7 @@ SRCREV_pn-matchbox-applet-light ?= "1548" | |||
46 | SRCREV_pn-matchbox-common ?= "1561" | 46 | SRCREV_pn-matchbox-common ?= "1561" |
47 | SRCREV_pn-matchbox-config-gtk ?= "1614" | 47 | SRCREV_pn-matchbox-config-gtk ?= "1614" |
48 | SRCREV_pn-matchbox-desktop-sato ?= "76" | 48 | SRCREV_pn-matchbox-desktop-sato ?= "76" |
49 | SRCREV_pn-matchbox-desktop ?= "2066" | 49 | SRCREV_pn-matchbox-desktop ?= "2077" |
50 | SRCREV_pn-matchbox-keyboard ?= "1910" | 50 | SRCREV_pn-matchbox-keyboard ?= "1910" |
51 | SRCREV_pn-matchbox-panel-2 ?= "2061" | 51 | SRCREV_pn-matchbox-panel-2 ?= "2061" |
52 | SRCREV_pn-matchbox-panel ?= "1364" | 52 | SRCREV_pn-matchbox-panel ?= "1364" |
@@ -55,7 +55,7 @@ SRCREV_pn-matchbox-terminal ?= "1612" | |||
55 | SRCREV_pn-matchbox-theme-sato-2 ?= "94" | 55 | SRCREV_pn-matchbox-theme-sato-2 ?= "94" |
56 | SRCREV_pn-matchbox-theme-sato ?= "90" | 56 | SRCREV_pn-matchbox-theme-sato ?= "90" |
57 | SRCREV_pn-matchbox-themes-extra ?= "1524" | 57 | SRCREV_pn-matchbox-themes-extra ?= "1524" |
58 | SRCREV_pn-matchbox-wm-2 ?= "2073" | 58 | SRCREV_pn-matchbox-wm-2 ?= "2074" |
59 | SRCREV_pn-matchbox-wm ?= "1524" | 59 | SRCREV_pn-matchbox-wm ?= "1524" |
60 | SRCREV_pn-oh-puzzles ?= "23" | 60 | SRCREV_pn-oh-puzzles ?= "23" |
61 | SRCREV_pn-opkg-native ?= "4545" | 61 | SRCREV_pn-opkg-native ?= "4545" |