From patchwork Wed Sep 26 18:02:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/2] oe-find-native-sysroot: show bitbake errors to user Date: Wed, 26 Sep 2012 18:02:26 -0000 From: Scott Garman X-Patchwork-Id: 37301 Message-Id: <5a9d41df316c1556df085de8662de191f5749d64.1348682342.git.scott.a.garman@intel.com> To: openembedded-core@lists.openembedded.org Ran into another bug that was masked by hiding a bitbake error message. This catches this situation and displays the error to the user. Also includes whitespace fixes. Signed-off-by: Scott Garman --- scripts/oe-find-native-sysroot | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot index b2c22aa..9df9b44 100755 --- a/scripts/oe-find-native-sysroot +++ b/scripts/oe-find-native-sysroot @@ -30,31 +30,40 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -if [ -z "$OECORE_NATIVE_SYSROOT" ]; then +if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then BITBAKE=`which bitbake 2> /dev/null` if [ "x$BITBAKE" != "x" ]; then - if [ "$UID" = "0" ]; then + if [ "$UID" = "0" ]; then # Root cannot run bitbake unless sanity checking is disabled if [ ! -d "./conf" ]; then - echo "Error: root cannot run bitbake by default, and I cannot find a ./conf directory to be able to disable sanity checking" - exit 1 + echo "Error: root cannot run bitbake by default, and I cannot find a ./conf directory to be able to disable sanity checking" + exit 1 fi touch conf/sanity.conf OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2` rm -f conf/sanity.conf - else + else OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2` - fi + fi else - echo "Error: Unable to locate your native sysroot." - echo "Did you forget to source the build environment setup script?" + echo "Error: Unable to locate bitbake command." + echo "Did you forget to source the build environment setup script?" - if [ -z "$SKIP_STRICT_SYSROOT_CHECK" ]; then + if [ -z "$SKIP_STRICT_SYSROOT_CHECK" ]; then exit 1 - fi + fi fi fi +if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then + # This indicates that there was an error running bitbake -e that + # the user needs to be informed of + echo "There was an error running bitbake to determine STAGING_DIR_NATIVE" + echo "Here is the output from bitbake -e" + bitbake -e + exit 1 +fi + # Set up pseudo command if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/pseudo" ]; then echo "Error: Unable to find pseudo binary in $OECORE_NATIVE_SYSROOT/usr/bin/"