diff options
| -rwxr-xr-x | scripts/oe-setup-builddir | 32 |
1 files changed, 17 insertions, 15 deletions
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 | |||
| 66 | OECORENOTESCONF="$TEMPLATECONF/conf-notes.txt" | 66 | OECORENOTESCONF="$TEMPLATECONF/conf-notes.txt" |
| 67 | fi | 67 | fi |
| 68 | 68 | ||
| 69 | unset SHOWYPDOC | ||
| 69 | if [ -z "$OECORELOCALCONF" ]; then | 70 | if [ -z "$OECORELOCALCONF" ]; then |
| 70 | OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample" | 71 | OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample" |
| 71 | fi | 72 | fi |
| @@ -77,15 +78,9 @@ different MACHINE (target hardware) or enable parallel build options to take | |||
| 77 | advantage of multiple cores for example. See the file for more information as | 78 | advantage of multiple cores for example. See the file for more information as |
| 78 | common configuration options are commented. | 79 | common configuration options are commented. |
| 79 | 80 | ||
| 80 | The Yocto Project has extensive documentation about OE including a reference manual | ||
| 81 | which can be found at: | ||
| 82 | http://yoctoproject.org/documentation | ||
| 83 | |||
| 84 | For more information about OpenEmbedded see their website: | ||
| 85 | http://www.openembedded.org/ | ||
| 86 | |||
| 87 | EOM | 81 | EOM |
| 88 | cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf | 82 | cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf |
| 83 | SHOWYPDOC=yes | ||
| 89 | fi | 84 | fi |
| 90 | 85 | ||
| 91 | if [ -z "$OECORELAYERCONF" ]; then | 86 | if [ -z "$OECORELAYERCONF" ]; then |
| @@ -97,14 +92,6 @@ You had no conf/bblayers.conf file. The configuration file has been created for | |||
| 97 | you with some default values. To add additional metadata layers into your | 92 | you with some default values. To add additional metadata layers into your |
| 98 | configuration please add entries to this file. | 93 | configuration please add entries to this file. |
| 99 | 94 | ||
| 100 | The Yocto Project has extensive documentation about OE including a reference manual | ||
| 101 | which can be found at: | ||
| 102 | http://yoctoproject.org/documentation | ||
| 103 | |||
| 104 | For more information about OpenEmbedded see their website: | ||
| 105 | http://www.openembedded.org/ | ||
| 106 | |||
| 107 | |||
| 108 | EOM | 95 | EOM |
| 109 | 96 | ||
| 110 | # Put the abosolute path to the layers in bblayers.conf so we can run | 97 | # Put the abosolute path to the layers in bblayers.conf so we can run |
| @@ -114,12 +101,27 @@ EOM | |||
| 114 | sed -e "s|##OEROOT##|$OEROOT|g" \ | 101 | sed -e "s|##OEROOT##|$OEROOT|g" \ |
| 115 | -e "s|##COREBASE##|$OEROOT|g" \ | 102 | -e "s|##COREBASE##|$OEROOT|g" \ |
| 116 | $OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf | 103 | $OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf |
| 104 | SHOWYPDOC=yes | ||
| 117 | fi | 105 | fi |
| 118 | 106 | ||
| 119 | # Prevent disturbing a new GIT clone in same console | 107 | # Prevent disturbing a new GIT clone in same console |
| 120 | unset OECORELOCALCONF | 108 | unset OECORELOCALCONF |
| 121 | unset OECORELAYERCONF | 109 | unset OECORELAYERCONF |
| 122 | 110 | ||
| 111 | # Ending the first-time run message. Show the YP Documentation banner. | ||
| 112 | if [ ! -z "$SHOWYPDOC" ]; then | ||
| 113 | cat <<EOM | ||
| 114 | The Yocto Project has extensive documentation about OE including a reference | ||
| 115 | manual which can be found at: | ||
| 116 | http://yoctoproject.org/documentation | ||
| 117 | |||
| 118 | For more information about OpenEmbedded see their website: | ||
| 119 | http://www.openembedded.org/ | ||
| 120 | |||
| 121 | EOM | ||
| 122 | # unset SHOWYPDOC | ||
| 123 | fi | ||
| 124 | |||
| 123 | cat <<EOM | 125 | cat <<EOM |
| 124 | 126 | ||
| 125 | ### Shell environment set up for builds. ### | 127 | ### Shell environment set up for builds. ### |
