Merge branch 'master' into rocko

scripts/run_bitbake.sh

@@ -8,10 +8,19 @@ arg0=$0
 while (( "$#" )); do
   shift
 done
-#DIR0="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-DIR=$(dirname $(dirname $(dirname $(realpath $(dirname $(dirname $arg0))/sysroots))))
 
-echo "DIR=" $DIR
+DIR=$(realpath $(dirname $(dirname $arg0))/sysroots)
+
+# works for Poky Jethro - Rocko
+# move up until Poky's init script is found
+while ([ ! -f $DIR/oe-init-build-env ]);do
+  DIR=$(dirname $DIR)
+  if [ "e$DIR" = 'e/' ]; then
+    break
+  fi
+done
+
+echo "DIR= $DIR"
 echo "Launching bitbake $args"
 #cd $DIR0/../../poky
 cd $DIR