make local.conf.sample catch up with BitBake

BKrev: 41c0bddffX1YVcEN2l48juavItF-OA

1 files changed, 23 insertions, 22 deletions

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index e161a7acf9..f4338bb1c0 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -9,48 +9,49 @@
 # file and build away.
 
 # The recommended setup is to create a build directory, such as
-# ${HOME}/oe/build/ (you may want to put OE and the packages into your
-# ${HOME}/oe/oe/ and ${HOME}/oe/packages/ respectively too).  Within your
+# ${HOME}/oe/build/ (you may want to put BitBake and the OE packages into your
+# ${HOME}/oe/bb/ and ${HOME}/oe/packages/ respectively too).  Within your
 # build environment, you should copy this file into conf/local.conf, and
 # then EDIT IT.  Fixup any paths to point to the correct locations, and
 # setup the target specifications appropriately.
 
-# NOTE: Do NOT use ~ in your paths, OE does NOT expand ~ for you.  If you
+# NOTE: Do NOT use ~ in your paths, BitBake does NOT expand ~ for you.  If you
 # must have paths relative to your homedir use ${HOME} (note the {}'s there
-# you MUST have them for the variable expansion to be done by OE).  Your
+# you MUST have them for the variable expansion to be done by BitBake).  Your
 # paths should all be absolute paths (They should all start with a / after
 # expansion.  Stuff like starting with ${HOME} or ${TOPDIR} is ok).
 
 # Once you have done that, you will want to cd into your build environment
-# (${HOME}/oe/build/ in this example), then run "oemake targets..."  This
+# (${HOME}/oe/build/ in this example), then run "bitbake targets..."  This
 # will build into ${TMPDIR} which defaults to ${TOPDIR}/tmp (${TOPDIR} is
-# the current directory when oemake was executed).
+# the current directory when bitbake was executed).
 
 #
 # Quick example of the described stuff above (builds the busybox packages):
 #
 # mkdir $HOME/sources
 # mkdir $HOME/oe
-#  .. clone oe and packages into $HOME/oe/oe and $HOME/oe/packages ..
+#  .. checkout BitBake from Berlios into $HOME/oe/bb
+#  .. checkout the OE packages repository into $HOME/oe/packages
 # mkdir $HOME/oe/build-arm
 # mkdir $HOME/oe/build-arm/conf
 # cd $HOME/oe/build-arm
 # cp ../packages/conf/local.conf.sample conf/local.conf
-#  .. EDIT conf/local.conf to set OEFILES and other vars properly ..
-# oemake busybox
+#  .. EDIT conf/local.conf to set BBFILES and other vars properly ..
+# bitbake busybox
 #  .. busybox is built in tmp/ from the current dir ($HOME/oe/build-arm) ..
 #
 
-# Use this to specify where OE should place the downloaded sources into
+# Use this to specify where BitBake should place the downloaded sources into
 DL_DIR = "${HOME}/sources"
 
-# Delete the line below. Then specify which .oe files to consider for
-# your build. Typically this will be something like OEFILES = "/path/to/packages/*/*.oe"
-OEFILES := "${@oe.fatal('Edit your conf/local.conf: OEFILES')}"
+# Delete the line below. Then specify which .bb files to consider for
+# your build. Typically this will be something like BBFILES = "/path/to/oe-packages/packages/*/*.bb"
+BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}"
 
-# Use the OEMASK below to instruct OE to _NOT_ consider some .oe files
+# Use the BBMASK below to instruct OE to _NOT_ consider some .bb files
 # This is a regulary expression, so be sure to get your parenthesis balanced.
-OEMASK = ""
+BBMASK = ""
 
 # Uncomment this if you want to use a prebuilt toolchain. You will need to
 # provide packages for toolchain and additional libraries yourself. You also
@@ -69,8 +70,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
-# Uncomment this to specify where OE should create its temporary files.
-# Note that a full build of everything in OE will take GigaBytes of hard
+# Uncomment this to specify where BitBake should create its temporary files.
+# Note that a full build of everything in OpenEmbedded will take GigaBytes of hard
 # disk space, so make sure to free enough space. The default TMPDIR is
 # <build directory>/tmp
 # TMPDIR = /usr/local/projects/oetmp
@@ -106,10 +107,10 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 # Uncomment this to disable the parse cache (not recommended).
 # CACHE = ""
 
-# Uncomment this if you want OE to emit debugging output
-# OEDEBUG = "yes"
+# Uncomment this if you want BitBake to emit debugging output
+# BBDEBUG = "yes"
 
-# Uncomment these two if you want OE to build images useful for debugging.
+# Uncomment these two if you want BitBake to build images useful for debugging.
 # DEBUG_BUILD = "1"
 # INHIBIT_PACKAGE_STRIP = "1"
 
@@ -123,8 +124,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 # SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}"
 # LDFLAGS =+ "-pg"
 
-# Uncomment this if you want OE to emit the log if a build fails.
-OEINCLUDELOGS = "yes"
+# Uncomment this if you want BitBake to emit the log if a build fails.
+BBINCLUDELOGS = "yes"
 
 # Specifies a location to search for pre-generated tarballs when fetching
 # a cvs:// URI.  Uncomment this, if you not want to pull directly from CVS.