[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5659/8267] oe-find-native-sysroot: add appopriate suggestion



commit c8b67a463f26a1f28bfad4be0952c6f67eab1e7f
Author: brian avery <brian avery intel com>
Date:   Wed Apr 12 14:29:13 2017 -0700

    oe-find-native-sysroot: add appopriate suggestion
    
    right now, if it fails, the script tells the user to run bitbake foo
    -caddto_recipe_sysroot. This works for native recipes but not things
    like meta-ide. This patch checks whether the recipe is native and gives
    out the appopriate warning.
    
    (From OE-Core rev: fc61211efd57d1858954e5cd241fce58dee9d01b)
    
    Signed-off-by: brian avery <brian avery intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/oe-find-native-sysroot |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot
index ad7b2d1..5c8681e 100755
--- a/scripts/oe-find-native-sysroot
+++ b/scripts/oe-find-native-sysroot
@@ -2,7 +2,7 @@
 #
 # Find a native sysroot to use - either from an in-tree OE build or
 # from a toolchain installation. It then ensures the variable
-# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and sets 
+# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and sets
 # $PSEUDO to the path of the pseudo binary.
 #
 # This script is intended to be run within other scripts by source'ing
@@ -48,7 +48,6 @@ fi
 # Global vars
 BITBAKE_E=""
 OECORE_NATIVE_SYSROOT=""
-
 set_oe_native_sysroot(){
     echo "Running bitbake -e $1"
     BITBAKE_E="`bitbake -e $1`"
@@ -93,7 +92,11 @@ if [ ! -e "$OECORE_NATIVE_SYSROOT/" ]; then
     echo "Error: $OECORE_NATIVE_SYSROOT doesn't exist."
 
     if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then
-        echo "Have you run 'bitbake $1 -caddto_recipe_sysroot'?"
+        if [[ $1 =~ .*native.* ]]; then
+            echo "Have you run 'bitbake $1 -caddto_recipe_sysroot'?"
+        else
+            echo "Have you run 'bitbake $1 '?"
+        fi
     else
         echo "This shouldn't happen - something is wrong with your toolchain installation"
     fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]