summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-03-03 20:18:21 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-09 16:36:32 +0000
commit0073679c60c813c7c8d62bff997feb30ce64543c (patch)
treea3a3f0a77ac7d9e853ca1c9d5f38b35df251e400
parent45e09f33b4607317d60e8ca01ce9c8fdb55df0a0 (diff)
downloadopenembedded-core-contrib-0073679c60c813c7c8d62bff997feb30ce64543c.tar.gz
openembedded-core-contrib-0073679c60c813c7c8d62bff997feb30ce64543c.tar.bz2
openembedded-core-contrib-0073679c60c813c7c8d62bff997feb30ce64543c.zip
oe-setup-builddir: tidy up local.conf and bblayers.conf commentary
Remove obsolete reference to enabling parallel build via local.conf. Unify wording used to explain that local.conf and bblayers.conf have been created based on defaults. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/oe-setup-builddir15
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index 2598ba852d..93722e08ad 100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -75,12 +75,11 @@ if [ -z "$OECORELOCALCONF" ]; then
OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample"
fi
if [ ! -r "$BUILDDIR/conf/local.conf" ]; then
-cat <<EOM
+ cat <<EOM
You had no conf/local.conf file. This configuration file has therefore been
-created for you with some default values. You may wish to edit it to use a
-different MACHINE (target hardware) or enable parallel build options to take
-advantage of multiple cores for example. See the file for more information as
-common configuration options are commented.
+created for you with some default values. You may wish to edit it to, for
+example, select a different MACHINE (target hardware). See conf/local.conf
+for more information as common configuration options are commented.
EOM
cp -f $OECORELOCALCONF "$BUILDDIR/conf/local.conf"
@@ -92,9 +91,9 @@ if [ -z "$OECORELAYERCONF" ]; then
fi
if [ ! -r "$BUILDDIR/conf/bblayers.conf" ]; then
cat <<EOM
-You had no conf/bblayers.conf file. The configuration file has been created for
-you with some default values. To add additional metadata layers into your
-configuration please add entries to this file.
+You had no conf/bblayers.conf file. This configuration file has therefore been
+created for you with some default values. To add additional metadata layers
+into your configuration please add entries to conf/bblayers.conf.
EOM