[meta-freescale] Updates to base (master) in 2014-07-11

[Otavio Salvador]

Hello,

I pushed following updates:

commit 60ba947c780452dc4556accfaa2ab1bfcec9878d (HEAD, m/master, freescale/master, pending)
Author: Trevor Woerner <trevor.woerner at linaro.org>
Date:   Wed Jul 9 11:26:05 2014 -0400

    setup-environment: conditionally show MACHINEs
    
    Before trying to show the supported MACHINEs, make sure they can be found,
    otherwise the error message to "ls" will be displayed (which users might find
    confusing).
    
    Tested on: bash, dash, zsh.
    
    Signed-off-by: Trevor Woerner <trevor.woerner at linaro.org>
    Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>

commit a59d9044af96918df5333d1fe64ccb0cc79a40f3
Author: Trevor Woerner <trevor.woerner at linaro.org>
Date:   Wed Jul 9 11:25:28 2014 -0400

    setup-environment: check script has been sourced
    
    Check that this script has been invoked correctly (i.e. that it has been
    "source"d and not merely run directly). If it has been run directly, don't
    exit immediately in case the user specified the "help" option, allow the help
    to be displayed, then exit. Adjust how this script is terminated based on
    whether it has been sourced or run directly (i.e. use either "return" or
    "exit" as required).
    
    This change fixes an infinite loop that is caused if the user runs this script
    directly and specifies the help option.
    
    These changes have been tested on: bash, dash, and zsh.
    
    Signed-off-by: Trevor Woerner <trevor.woerner at linaro.org>
    Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>

commit 713c126e9c64ff4a5643a64285a32d1aed927a68
Author: Ting Liu <ting.liu at freescale.com>
Date:   Wed Jul 9 11:38:26 2014 +0800

    setup-environment: return if no conf/local.conf generated
    
    there will be no conf/local.conf generated if python version check
    in poky/scripts/oe-buildenv-internal failed. In this case, no need
    to go further.
    
    Signed-off-by: Ting Liu <ting.liu at freescale.com>
    Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>

Regards,

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750