[oe-commits] [openembedded-core] 56/69: oe-setup-builddir: tidy up local.conf and bblayers.conf commentary

git at git.openembedded.org git at git.openembedded.org
Mon Mar 7 22:12:46 UTC 2016


rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 7aa539a3ce655801703d5c6771c4a953f6a29cbb
Author: Andre McCurdy <armccurdy at gmail.com>
AuthorDate: Thu Mar 3 20:18:21 2016 -0800

    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 at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/oe-setup-builddir | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index 2598ba8..93722e0 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
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list