summaryrefslogtreecommitdiff
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/local.conf.sample10
-rw-r--r--meta/conf/local.conf.sample.extended8
2 files changed, 9 insertions, 9 deletions
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 197510ab3..84ed964cc 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -45,7 +45,7 @@ MACHINE ??= "qemux86"
#
# Where to place downloads
#
-# During a first build the system will download many differernt source code tarballs
+# During a first build the system will download many different source code tarballs
# from various upstream projects. This can take a while, particularly if your network
# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
# can preserve this directory to speed up this part of subsequent builds. This directory
@@ -63,7 +63,7 @@ MACHINE ??= "qemux86"
# and this option determines where those files are placed.
#
# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
-# from these files if no chages were made to the configuration. If changes were made
+# from these files if no changes were made to the configuration. If changes were made
# to the configuration, only shared state files where the state was still valid would
# be used (done using checksums).
#
@@ -76,7 +76,7 @@ MACHINE ??= "qemux86"
#
# This option specifies where the bulk of the building work should be done and
# where BitBake should place its temporary files and output. Keep in mind that
-# this includes the extraction and complation of many applications and the toolchain
+# this includes the extraction and compilation of many applications and the toolchain
# which can use Gigabytes of hard disk space.
#
# The default is a tmp directory under TOPDIR.
@@ -182,8 +182,8 @@ USER_CLASSES ?= "image-mklibs image-prelink"
# newer Konsole versions behave
#TERMCMD = "${XTERM_TERMCMD}"
#TERMCMDRUN = "${XTERM_TERMCMDRUN}"
-# You can disable interactive patch resolution (tasks will just fail instead) with:
-#PATCHRESOLVE = "noop"
+# By default disable interactive patch resolution (tasks will just fail instead):
+PATCHRESOLVE = "noop"
#
# Shared-state files from other locations
diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended
index aa5318dd2..0c3197d7f 100644
--- a/meta/conf/local.conf.sample.extended
+++ b/meta/conf/local.conf.sample.extended
@@ -2,7 +2,7 @@
# certain recipes.
#BBMASK = ""
-# eglibc configurability is used to reduce minimal images's size.
+# eglibc configurability is used to reduce minimal image's size.
# the all supported eglibc options are listed in DISTRO_FEATURES_LIBC
# and disabled by default. Uncomment and copy the DISTRO_FEATURES_LIBC
# and DISTRO_FEATURES definitions to local.conf to enable the options.
@@ -56,8 +56,8 @@
# a central debug-file-directory, /usr/lib/debug:
# /bin/foo -> /usr/lib/debug/bin/foo.debug
#
-# Any source code referenced in the debug symbols will be copied
-# and made available within the /usr/src/debug directory
+# Any source code referenced in the debug symbols will be copied
+# and made available within the /usr/src/debug directory
#
#PACKAGE_DEBUG_SPLIT_STYLE = '.debug'
# PACKAGE_DEBUG_SPLIT_STYLE = 'debug-file-directory'
@@ -78,7 +78,7 @@
# The default is "default"
# Use "external-MODE" to use the precompiled external toolchains where MODE
# is the type of external toolchain to use e.g. eabi. You need to ensure
-# the toolchain you want to use is included in an an appropriate layer
+# the toolchain you want to use is included in an appropriate layer
# TCMODE = "external-eabi"
# mklibs library size optimization is more useful to smaller images,