[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7347/8267] meta: move some text from oe-setup-builddir to conf-notes.txt

[Emmanuele Bassi <ebassi src gnome org>]

commit 96d0d4b5b671ea08cb4dcaedc84e783f253d941e
Author: Ming Liu <peter x liu external atlascopco com>
Date:   Mon Aug 21 13:45:52 2017 +0200

    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.
    
    (From OE-Core rev: 80bc8282df58dfeaae8f2f71ed2617d718e29f8b)
    
    Signed-off-by: Ming Liu <peter x liu external atlascopco com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/conf/conf-notes.txt  |    5 +++++
 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 2f2932b..f1a4f4d 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 ef49551..55d73ca 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