sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

oe-setup-builddir: output message cleanup 

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

[YOCTO #7368]

(From OE-Core rev: 49ed897c01cb3be7582f79d863110688cc46dc55)

Signed-off-by: Benjamin Esquivel <benjamin.esquivel@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Benjamin Esquivel 2015-03-11 10:40:46 +00:00 committed by Richard Purdie
parent 18c1c517b3
commit 1d43c3c214
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
scripts/oe-setup-builddir
View File

@ -66,6 +66,7 @@ if [ -n "$TEMPLATECONF" ]; then
OECORENOTESCONF="$TEMPLATECONF/conf-notes.txt" OECORENOTESCONF="$TEMPLATECONF/conf-notes.txt"
fi fi
unset SHOWYPDOC
if [ -z "$OECORELOCALCONF" ]; then if [ -z "$OECORELOCALCONF" ]; then
OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample" OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample"
fi 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 advantage of multiple cores for example. See the file for more information as
common configuration options are commented. 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 EOM
cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf
SHOWYPDOC=yes
fi fi
if [ -z "$OECORELAYERCONF" ]; then 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 you with some default values. To add additional metadata layers into your
configuration please add entries to this file. 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 EOM
# Put the abosolute path to the layers in bblayers.conf so we can run # 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" \ sed -e "s|##OEROOT##|$OEROOT|g" \
-e "s|##COREBASE##|$OEROOT|g" \ -e "s|##COREBASE##|$OEROOT|g" \
$OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf $OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf
SHOWYPDOC=yes
fi fi
# Prevent disturbing a new GIT clone in same console # Prevent disturbing a new GIT clone in same console
unset OECORELOCALCONF unset OECORELOCALCONF
unset OECORELAYERCONF 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 cat <<EOM
### Shell environment set up for builds. ### ### Shell environment set up for builds. ###