summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2011-10-11 16:25:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 14:11:30 +0100
commitbe9ee810bd00b74770b659fdc7da19c2166debee (patch)
tree15329b9c94e92778872467db94e154fc73dbdddd
parent0c05d53fbede6feed6e9d361cb631a364f045a0f (diff)
downloadpoky-be9ee810bd00b74770b659fdc7da19c2166debee.tar.gz
Fix typos in local.conf.sample and local.conf.sample.extended
Fixes bug [YOCTO #1667] Fix typos in local.conf.sample and local.conf.sample.extended: differernt -> different chages -> changes complation -> compilation egde -> edge "an an" -> "as an" images's -> image's Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/__init__.py2
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py1
-rw-r--r--meta-yocto/conf/local.conf.sample10
-rw-r--r--meta-yocto/conf/local.conf.sample.extended4
4 files changed, 8 insertions, 9 deletions
diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py
index 3c8572476c..4981daa420 100644
--- a/bitbake/lib/bb/__init__.py
+++ b/bitbake/lib/bb/__init__.py
@@ -67,7 +67,7 @@ if "BBDEBUG" in os.environ:
67 if level: 67 if level:
68 bb.msg.set_debug_level(level) 68 bb.msg.set_debug_level(level)
69 69
70if True or os.environ.get("BBFETCH2"): 70if os.environ.get("BBFETCH2"):
71 from bb import fetch2 as fetch 71 from bb import fetch2 as fetch
72 sys.modules['bb.fetch'] = sys.modules['bb.fetch2'] 72 sys.modules['bb.fetch'] = sys.modules['bb.fetch2']
73 73
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index c59b468e0b..851a7e6698 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -193,7 +193,6 @@ def feeder(lineno, s, fn, root, statements):
193 if lineno == IN_PYTHON_EOF: 193 if lineno == IN_PYTHON_EOF:
194 return 194 return
195 195
196
197 if s and s[0] == '#': 196 if s and s[0] == '#':
198 if len(__residue__) != 0 and __residue__[0][0] != "#": 197 if len(__residue__) != 0 and __residue__[0][0] != "#":
199 bb.error("There is a comment on line %s of file %s (%s) which is in the middle of a multiline expression.\nBitbake used to ignore these but no longer does so, please fix your metadata as errors are likely as a result of this change." % (lineno, fn, s)) 198 bb.error("There is a comment on line %s of file %s (%s) which is in the middle of a multiline expression.\nBitbake used to ignore these but no longer does so, please fix your metadata as errors are likely as a result of this change." % (lineno, fn, s))
diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index 0c24208772..da3f8df9a0 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -53,7 +53,7 @@ MACHINE ??= "qemux86"
53# 53#
54# Where to place downloads 54# Where to place downloads
55# 55#
56# During a first build the system will download many differernt source code tarballs 56# During a first build the system will download many different source code tarballs
57# from various upstream projects. This can take a while, particularly if your network 57# from various upstream projects. This can take a while, particularly if your network
58# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you 58# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
59# can preserve this directory to speed up this part of subsequent builds. This directory 59# can preserve this directory to speed up this part of subsequent builds. This directory
@@ -71,7 +71,7 @@ MACHINE ??= "qemux86"
71# and this option determines where those files are placed. 71# and this option determines where those files are placed.
72# 72#
73# You can wipe out TMPDIR leaving this directory intact and the build would regenerate 73# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
74# from these files if no chages were made to the configuration. If changes were made 74# from these files if no changes were made to the configuration. If changes were made
75# to the configuration, only shared state files where the state was still valid would 75# to the configuration, only shared state files where the state was still valid would
76# be used (done using checksums). 76# be used (done using checksums).
77# 77#
@@ -84,7 +84,7 @@ MACHINE ??= "qemux86"
84# 84#
85# This option specifies where the bulk of the building work should be done and 85# This option specifies where the bulk of the building work should be done and
86# where BitBake should place its temporary files and output. Keep in mind that 86# where BitBake should place its temporary files and output. Keep in mind that
87# this includes the extraction and complation of many applications and the toolchain 87# this includes the extraction and compilation of many applications and the toolchain
88# which can use Gigabytes of hard disk space. 88# which can use Gigabytes of hard disk space.
89# 89#
90# The default is a tmp directory under TOPDIR. 90# The default is a tmp directory under TOPDIR.
@@ -100,9 +100,9 @@ MACHINE ??= "qemux86"
100# these defaults. 100# these defaults.
101# 101#
102DISTRO ?= "poky" 102DISTRO ?= "poky"
103# As an exable of a subclass there is a "bleeding" egde policy configuration 103# As an example of a subclass there is a "bleeding" edge policy configuration
104# where many versions are set to the absolute latest code from the upstream 104# where many versions are set to the absolute latest code from the upstream
105# source control systems. This is just mentioned here an an example, its not 105# source control systems. This is just mentioned here as an example, its not
106# useful to most new users. 106# useful to most new users.
107# DISTRO ?= "poky-bleeding" 107# DISTRO ?= "poky-bleeding"
108 108
diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended
index a42774cfac..0c3197d7f7 100644
--- a/meta-yocto/conf/local.conf.sample.extended
+++ b/meta-yocto/conf/local.conf.sample.extended
@@ -2,7 +2,7 @@
2# certain recipes. 2# certain recipes.
3#BBMASK = "" 3#BBMASK = ""
4 4
5# eglibc configurability is used to reduce minimal images's size. 5# eglibc configurability is used to reduce minimal image's size.
6# the all supported eglibc options are listed in DISTRO_FEATURES_LIBC 6# the all supported eglibc options are listed in DISTRO_FEATURES_LIBC
7# and disabled by default. Uncomment and copy the DISTRO_FEATURES_LIBC 7# and disabled by default. Uncomment and copy the DISTRO_FEATURES_LIBC
8# and DISTRO_FEATURES definitions to local.conf to enable the options. 8# and DISTRO_FEATURES definitions to local.conf to enable the options.
@@ -78,7 +78,7 @@
78# The default is "default" 78# The default is "default"
79# Use "external-MODE" to use the precompiled external toolchains where MODE 79# Use "external-MODE" to use the precompiled external toolchains where MODE
80# is the type of external toolchain to use e.g. eabi. You need to ensure 80# is the type of external toolchain to use e.g. eabi. You need to ensure
81# the toolchain you want to use is included in an an appropriate layer 81# the toolchain you want to use is included in an appropriate layer
82# TCMODE = "external-eabi" 82# TCMODE = "external-eabi"
83 83
84# mklibs library size optimization is more useful to smaller images, 84# mklibs library size optimization is more useful to smaller images,