diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2016-03-03 20:18:21 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 16:58:11 +0000 |
commit | 424466b91fa3755c3cced9781d562f60fa7bfa62 (patch) | |
tree | 2f197eb9618f1de8c20c924371a7531a03f97759 /scripts | |
parent | 07919e948cea3f6bc8525ca997c15a2c5b663986 (diff) | |
download | poky-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')
-rwxr-xr-x | scripts/oe-setup-builddir | 15 |
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" |
76 | fi | 76 | fi |
77 | if [ ! -r "$BUILDDIR/conf/local.conf" ]; then | 77 | if [ ! -r "$BUILDDIR/conf/local.conf" ]; then |
78 | cat <<EOM | 78 | cat <<EOM |
79 | You had no conf/local.conf file. This configuration file has therefore been | 79 | You had no conf/local.conf file. This configuration file has therefore been |
80 | created for you with some default values. You may wish to edit it to use a | 80 | created for you with some default values. You may wish to edit it to, for |
81 | different MACHINE (target hardware) or enable parallel build options to take | 81 | example, select a different MACHINE (target hardware). See conf/local.conf |
82 | advantage of multiple cores for example. See the file for more information as | 82 | for more information as common configuration options are commented. |
83 | common configuration options are commented. | ||
84 | 83 | ||
85 | EOM | 84 | EOM |
86 | cp -f $OECORELOCALCONF "$BUILDDIR/conf/local.conf" | 85 | cp -f $OECORELOCALCONF "$BUILDDIR/conf/local.conf" |
@@ -92,9 +91,9 @@ if [ -z "$OECORELAYERCONF" ]; then | |||
92 | fi | 91 | fi |
93 | if [ ! -r "$BUILDDIR/conf/bblayers.conf" ]; then | 92 | if [ ! -r "$BUILDDIR/conf/bblayers.conf" ]; then |
94 | cat <<EOM | 93 | cat <<EOM |
95 | You had no conf/bblayers.conf file. The configuration file has been created for | 94 | You had no conf/bblayers.conf file. This configuration file has therefore been |
96 | you with some default values. To add additional metadata layers into your | 95 | created for you with some default values. To add additional metadata layers |
97 | configuration please add entries to this file. | 96 | into your configuration please add entries to conf/bblayers.conf. |
98 | 97 | ||
99 | EOM | 98 | EOM |
100 | 99 | ||