summaryrefslogtreecommitdiffstats
path: root/scripts/oe-setup-builddir
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:58:11 +0000
commit424466b91fa3755c3cced9781d562f60fa7bfa62 (patch)
tree2f197eb9618f1de8c20c924371a7531a03f97759 /scripts/oe-setup-builddir
parent07919e948cea3f6bc8525ca997c15a2c5b663986 (diff)
downloadpoky-424466b91fa3755c3cced9781d562f60fa7bfa62.tar.gz
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. (From OE-Core rev: 0073679c60c813c7c8d62bff997feb30ce64543c) 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>
Diffstat (limited to 'scripts/oe-setup-builddir')
-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
75 OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample" 75 OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample"
76fi 76fi
77if [ ! -r "$BUILDDIR/conf/local.conf" ]; then 77if [ ! -r "$BUILDDIR/conf/local.conf" ]; then
78cat <<EOM 78 cat <<EOM
79You had no conf/local.conf file. This configuration file has therefore been 79You had no conf/local.conf file. This configuration file has therefore been
80created for you with some default values. You may wish to edit it to use a 80created for you with some default values. You may wish to edit it to, for
81different MACHINE (target hardware) or enable parallel build options to take 81example, select a different MACHINE (target hardware). See conf/local.conf
82advantage of multiple cores for example. See the file for more information as 82for more information as common configuration options are commented.
83common configuration options are commented.
84 83
85EOM 84EOM
86 cp -f $OECORELOCALCONF "$BUILDDIR/conf/local.conf" 85 cp -f $OECORELOCALCONF "$BUILDDIR/conf/local.conf"
@@ -92,9 +91,9 @@ if [ -z "$OECORELAYERCONF" ]; then
92fi 91fi
93if [ ! -r "$BUILDDIR/conf/bblayers.conf" ]; then 92if [ ! -r "$BUILDDIR/conf/bblayers.conf" ]; then
94 cat <<EOM 93 cat <<EOM
95You had no conf/bblayers.conf file. The configuration file has been created for 94You had no conf/bblayers.conf file. This configuration file has therefore been
96you with some default values. To add additional metadata layers into your 95created for you with some default values. To add additional metadata layers
97configuration please add entries to this file. 96into your configuration please add entries to conf/bblayers.conf.
98 97
99EOM 98EOM
100 99