scripts: change way we find native tools (pseudo)
oe-find-native-sysroot: Recipe Specific Sysroots have eliminated the large STAGING_DIR_NATIVE. Now, we will rely on the meta-ide-support sysroot that is what was populating the large STAGING_DIR_NATIVE in previous versions anyway. We now look for RECIPE_SYSROOT_NATIVE. [YOCTO #11119] (From OE-Core rev: d8b4c58676705e9749347be0e8f191ccccc37f05) Signed-off-by: brian avery <brian.avery@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
bb81269c3d
commit
f200f37699
|
@ -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
|
||||
|
@ -54,10 +54,10 @@ if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then
|
|||
exit 1
|
||||
fi
|
||||
touch conf/sanity.conf
|
||||
OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '"' -f2`
|
||||
OECORE_NATIVE_SYSROOT=`bitbake -e meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2`
|
||||
rm -f conf/sanity.conf
|
||||
else
|
||||
OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '"' -f2`
|
||||
OECORE_NATIVE_SYSROOT=`bitbake -e meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2`
|
||||
fi
|
||||
else
|
||||
echo "Error: Unable to locate bitbake command."
|
||||
|
@ -72,7 +72,7 @@ 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 "There was an error running bitbake to determine RECIPE_SYSROOT_NATIVE"
|
||||
echo "Here is the output from bitbake -e"
|
||||
bitbake -e
|
||||
exit 1
|
||||
|
|
Loading…
Reference in New Issue