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>

diff --git a/meta/conf/conf-notes.txt b/meta/conf/conf-notes.txt
index 2f2932ba1f6bc3c7841d1a1b27d8df4358a7887f..f1a4f4da143a92d66816b3e6f1b66a7881550dc5 100644 (file)
--- 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 ef495517aaafd8150313ac1f8f5eb5079c90d09b..55d73ca1e46fb18864ec08c5a910da4b714d00d4 100755 (executable)
--- 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