summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <darren@dvhart.com>2010-08-16 20:14:49 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-21 23:38:00 +0100
commit1cf456611d1e14ab06d93da34ca8898fe3692a84 (patch)
treec94f7cf1c06244d9c9c835dac4099645dfd4c68e
parentf342f3ba68d8cbd5b5b58129ba16324f280de6b1 (diff)
downloadpoky-1cf456611d1e14ab06d93da34ca8898fe3692a84.tar.gz
Wrap output at 80 columns for poky-env-internal
The output of: $ source poky-init-build-env would wrap on 80 character terminals, making the output difficult to read. Replace the somewhat clumsy repeated usage of "echo" with bash here documents, limiting line length to 80 characters. The use of here documents simplifies this by removing any leading commands or indentation from the output being generated. A bash'ism should be acceptable here as poky-init-build-env already aborts if the shell is not bash. Signed-off-by: Darren Hart <darren@dvhart.com>
-rwxr-xr-xscripts/poky-env-internal56
1 files changed, 35 insertions, 21 deletions
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index 5250e5f545..f425bab079 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -62,13 +62,17 @@ if [ "x" = "x$POKYLOCALCONF" ]; then
62 POKYLOCALCONF="$OEROOT/meta/conf/local.conf.sample" 62 POKYLOCALCONF="$OEROOT/meta/conf/local.conf.sample"
63fi 63fi
64if ! (test -r "$BUILDDIR/conf/local.conf"); then 64if ! (test -r "$BUILDDIR/conf/local.conf"); then
65 echo "You had no conf/local.conf file. Poky has created this configuration file for you" 65cat <<EOM
66 echo "with some default values. You may wish to edit it to use a different MACHINE (target" 66You had no conf/local.conf file. Poky has created this configuration file for
67 echo "hardware) or enable parallel build options to take advantage of multiple cores for" 67you with some default values. You may wish to edit it to use a different MACHINE
68 echo "example. See the file for more information as common configuration options are commented." 68(target hardware) or enable parallel build options to take advantage of multiple
69 echo 69cores for example. See the file for more information as common configuration
70 echo "Also, for more information see the Poky handbook: http://pokylinux.org/doc/poky-handbook.html" 70options are commented.
71 echo 71
72Also, for more information see the Poky handbook:
73http://pokylinux.org/doc/poky-handbook.html
74
75EOM
72 cp -f $POKYLOCALCONF $BUILDDIR/conf/local.conf 76 cp -f $POKYLOCALCONF $BUILDDIR/conf/local.conf
73fi 77fi
74 78
@@ -76,12 +80,15 @@ if [ "x" = "x$POKYLAYERCONF" ]; then
76 POKYLAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample" 80 POKYLAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample"
77fi 81fi
78if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then 82if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then
79 echo "You had no conf/bblayers.conf file. Poky has created this configuration file for you" 83cat <<EOM
80 echo "with some default values. To add additional metadata layers into your configuration please" 84You had no conf/bblayers.conf file. Poky has created this configuration file for
81 echo "add entries to this file." 85you with some default values. To add additional metadata layers into your
82 echo 86configuration please add entries to this file.
83 echo "For more information see the Poky handbook: http://pokylinux.org/doc/poky-handbook.html" 87
84 echo 88For more information see the Poky handbook:
89 http://pokylinux.org/doc/poky-handbook.html
90
91EOM
85 92
86 # Put the abosolute path to the layers in bblayers.conf so we can run 93 # Put the abosolute path to the layers in bblayers.conf so we can run
87 # bitbake without the init script after the first run 94 # bitbake without the init script after the first run
@@ -109,13 +116,20 @@ unset PYTHONPATH
109# Don't allow custom GConf schema paths to get into the system 116# Don't allow custom GConf schema paths to get into the system
110unset GCONF_SCHEMA_INSTALL_SOURCE 117unset GCONF_SCHEMA_INSTALL_SOURCE
111 118
112echo 119cat <<EOM
113echo "### Shell environment set up for Poky builds. ###" 120
114echo 121### Shell environment set up for Poky builds. ###
115echo "You can now run 'bitbake <target>'" 122
116echo 123You can now run 'bitbake <target>'
117echo "Common targets are poky-image-minimal, poky-image-sato, meta-toolchain or meta-toolchain-sdk" 124
118echo 125Common targets are:
119echo "You can also run generated qemu images with a command like 'runqemu qemux86'" 126 poky-image-minimal
127 poky-image-sato
128 meta-toolchain
129 meta-toolchain-sdk
130
131You can also run generated qemu images with a command like 'runqemu qemux86'
132
133EOM
120 134
121export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC OEROOT http_proxy ftp_proxy https_proxy no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS GIT_PROXY_COMMAND" 135export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC OEROOT http_proxy ftp_proxy https_proxy no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS GIT_PROXY_COMMAND"