From 49ed897c01cb3be7582f79d863110688cc46dc55 Mon Sep 17 00:00:00 2001
From: Benjamin Esquivel <benjamin.esquivel@linux.intel.com>
Date: Wed, 11 Mar 2015 10:40:46 +0000
Subject: oe-setup-builddir: output message cleanup

Moved a Yoctoproject documentation banner to the end of the first-time
run messages section

[YOCTO #7368]

Signed-off-by: Benjamin Esquivel <benjamin.esquivel@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 scripts/oe-setup-builddir | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'scripts')

diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index c91e079512..f73aa3416d 100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -66,6 +66,7 @@ if [ -n "$TEMPLATECONF" ]; then
     OECORENOTESCONF="$TEMPLATECONF/conf-notes.txt"
 fi
 
+unset SHOWYPDOC
 if [ -z "$OECORELOCALCONF" ]; then
     OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample"
 fi
@@ -77,15 +78,9 @@ different MACHINE (target hardware) or enable parallel build options to take
 advantage of multiple cores for example. See the file for more information as 
 common configuration options are commented.
 
-The Yocto Project has extensive documentation about OE including a reference manual
-which can be found at:
-    http://yoctoproject.org/documentation
-
-For more information about OpenEmbedded see their website:
-    http://www.openembedded.org/
-
 EOM
     cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf
+    SHOWYPDOC=yes
 fi
 
 if [ -z "$OECORELAYERCONF" ]; then
@@ -97,14 +92,6 @@ You had no conf/bblayers.conf file. The configuration file has been created for
 you with some default values. To add additional metadata layers into your
 configuration please add entries to this file.
 
-The Yocto Project has extensive documentation about OE including a reference manual
-which can be found at:
-    http://yoctoproject.org/documentation
-
-For more information about OpenEmbedded see their website:
-    http://www.openembedded.org/
-
-
 EOM
 
     # Put the abosolute path to the layers in bblayers.conf so we can run
@@ -114,12 +101,27 @@ EOM
     sed -e "s|##OEROOT##|$OEROOT|g" \
         -e "s|##COREBASE##|$OEROOT|g" \
         $OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf
+    SHOWYPDOC=yes
 fi
 
 # Prevent disturbing a new GIT clone in same console
 unset OECORELOCALCONF
 unset OECORELAYERCONF
 
+# Ending the first-time run message. Show the YP Documentation banner.
+if [ ! -z "$SHOWYPDOC" ]; then
+    cat <<EOM
+The Yocto Project has extensive documentation about OE including a reference
+manual which can be found at:
+    http://yoctoproject.org/documentation
+
+For more information about OpenEmbedded see their website:
+    http://www.openembedded.org/
+
+EOM
+#    unset SHOWYPDOC
+fi
+
 cat <<EOM
 
 ### Shell environment set up for builds. ###
-- 
cgit 1.2.3-korg