From 79ab3910a0626ab79e3c0a23983bcdfc933fd17b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 11 Oct 2011 14:08:10 +0100 Subject: local.conf.sample: Fix typos and default to no patch resolver Based on a patch from Robert Yang Signed-off-by: Richard Purdie --- meta/conf/local.conf.sample | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/conf/local.conf.sample') diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample index 197510ab32..84ed964ccf 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 -- cgit 1.2.3-korg