diff options
author | Ming Liu <peter.x.liu@external.atlascopco.com> | 2017-08-21 13:45:52 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-23 08:47:05 +0100 |
commit | 80bc8282df58dfeaae8f2f71ed2617d718e29f8b (patch) | |
tree | e806fae795286c527a889add770112d0188c4f7a | |
parent | 8291156c30e54a05ad455dda2b8540a570bb0f4a (diff) | |
download | openembedded-core-80bc8282df58dfeaae8f2f71ed2617d718e29f8b.tar.gz openembedded-core-80bc8282df58dfeaae8f2f71ed2617d718e29f8b.tar.bz2 openembedded-core-80bc8282df58dfeaae8f2f71ed2617d718e29f8b.zip |
meta: move some text from oe-setup-builddir to conf-notes.txt
This allows the end users to be able to override the entire notes
showing on the shell console. For instance, Our company uses a
external conf-notes.txt, and we run bitbake with some extra variables,
looks like: F=xxx D=xxx M=xxx bitbake <target>, so we want to show
exactly these texts on the shell console, that's why we need this
change.
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/conf-notes.txt | 5 | ||||
-rwxr-xr-x | scripts/oe-setup-builddir | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/meta/conf/conf-notes.txt b/meta/conf/conf-notes.txt index 2f2932ba1f..f1a4f4da14 100644 --- a/meta/conf/conf-notes.txt +++ b/meta/conf/conf-notes.txt @@ -1,3 +1,8 @@ + +### Shell environment set up for builds. ### + +You can now run 'bitbake <target>' + Common targets are: core-image-minimal core-image-sato diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index ef495517aa..55d73ca1e4 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -133,13 +133,6 @@ EOM # unset SHOWYPDOC fi -cat <<EOM - -### Shell environment set up for builds. ### - -You can now run 'bitbake <target>' - -EOM if [ -z "$OECORENOTESCONF" ]; then OECORENOTESCONF="$OEROOT/meta/conf/conf-notes.txt" fi |