From 056a8bbe1eb2369ec0605c41c3e3837e1de03865 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 6 Sep 2023 16:16:48 +0100 Subject: [PATCH] scripts/oe-find-native-sysroot: use bitbake-getvar Instead of bitbake and grep, just use bitbake-getvar. (From OE-Core rev: b5011a2fc248d88b5491cf6af1fc15e5974f6e45) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/oe-find-native-sysroot | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot index 5146bbf999..6228efcbee 100755 --- a/scripts/oe-find-native-sysroot +++ b/scripts/oe-find-native-sysroot @@ -36,20 +36,9 @@ if [ "$1" = '--help' -o "$1" = '-h' -o $# -ne 1 ] ; then fi # Global vars -BITBAKE_E="" set_oe_native_sysroot(){ - echo "Running bitbake -e $1" - BITBAKE_E="`bitbake -e $1`" - OECORE_NATIVE_SYSROOT=`echo "$BITBAKE_E" | grep ^STAGING_DIR_NATIVE= | cut -d '"' -f2` - - 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 $1" - echo $BITBAKE_E - exit 1 - fi + echo "Getting sysroot..." + OECORE_NATIVE_SYSROOT=$(bitbake-getvar -r $1 --value STAGING_DIR_NATIVE) } if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then