X-Git-Url: https://git.karo-electronics.de/?p=meta-tx09.git;a=blobdiff_plain;f=setup-environment;h=1b74a8387793e822df1b588900f04b82e9f6d5ec;hp=c8ab38901c1be59eab6c7ee9210378b938986787;hb=806b5b6c3f9d06d794ae163f106f95e9e0d1d17a;hpb=ecdd71eb7ab250770630fb47d79804f209323323

diff --git a/setup-environment b/setup-environment
index c8ab389..1b74a83 100755
--- a/setup-environment
+++ b/setup-environment
@@ -27,14 +27,16 @@ PROGNAME="setup-environment"
 usage()
 {
     echo -e "
+Usage: . $PROGNAME <build-dir>
 Usage: MACHINE=<machine> DISTRO=<distro> source $PROGNAME <build-dir>
 Usage:                                   source $PROGNAME <build-dir>
     <machine>    machine name
-    <distro>     distro name
+    <distro>     distribution name
     <build-dir>  build directory
 
 The first usage is for creating a new build directory. In this case, the
-script creates the build directory <build-dir>, configures it for the
+script creates the build directory <build-dir> and confgures it according
+to the supplied sdkdefaults.conf. Optionally it configures it for the
 specified <machine> and <distro>, and prepares the calling shell for running
 bitbake on the build directory.
 
@@ -44,7 +46,6 @@ directory <build-dir>. The build directory configuration is unchanged.
 "
 
     ls yocto/*/conf/machine/*.conf > /dev/null 2>&1
-#    ls sources/meta-freescale-distro/conf/distro/fslc-*.conf > /dev/null 2>&1
     if [ $? -eq 0 ]; then
         echo -e "
 Supported machines: `echo; ls conf/*/conf/machine/*.conf \
@@ -55,11 +56,13 @@ Available Poky's distros: `echo; ls yocto/poky/meta-poky/conf/distro/*.conf \
 
 Examples:
 
-- To create a new Yocto build directory:
+- To use an existing Yocto build directory or create a new build dir using 
+  the supplied defaults.
+  $ . $PROGNAME build
+  
+- To create a new Yocto build directory with custom defaults:
   $ MACHINE=tx6q-xxxx DISTRO=poky . $PROGNAME build
 
-- To use an existing Yocto build directory:
-  $ . $PROGNAME build
 "
     fi
 }
@@ -157,7 +160,7 @@ if [ "$build_dir_setup_enabled" = "true" ]; then
 
     # Generate the local.conf based on the Yocto defaults
     TEMPLATES=$CWD/yocto/meta-kc-bsp/conf
-    grep -v '^#\|^$' conf/local.conf.sample > conf/local.conf
+    cat conf/local.conf.sample > conf/local.conf
     cat >> conf/local.conf <<EOF
 
 DL_DIR ?= "\${BSPDIR}/downloads/"
@@ -221,4 +224,7 @@ else
     echo
 fi
 
+# indicate Yocto environment on shell prompt
+export PS1="[yocto] $PS1"
+
 clean_up