crosstap: Changes to support Recipe specific sysroot
The crosstap script needed to be updated for recipe specific sysroot changes including adding support for finding the systemtap binaries. [YOCTO #10990] (From OE-Core rev: 1098bcbc4520874967e7bd23fe798ab1a123fac4) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
3f0037ce3c
commit
07eca81801
|
@ -104,13 +104,19 @@ STAGING_BINDIR_TOOLCHAIN=$(echo "$BITBAKE_VARS" | grep ^STAGING_BINDIR_TOOLCHAIN
|
||||||
| cut -d '=' -f2 | cut -d '"' -f2)
|
| cut -d '=' -f2 | cut -d '"' -f2)
|
||||||
STAGING_BINDIR_TOOLPREFIX=$(echo "$BITBAKE_VARS" | grep ^TARGET_PREFIX \
|
STAGING_BINDIR_TOOLPREFIX=$(echo "$BITBAKE_VARS" | grep ^TARGET_PREFIX \
|
||||||
| cut -d '=' -f2 | cut -d '"' -f2)
|
| cut -d '=' -f2 | cut -d '"' -f2)
|
||||||
SYSTEMTAP_HOST_INSTALLDIR=$(echo "$BITBAKE_VARS" | grep ^STAGING_DIR_NATIVE \
|
|
||||||
| cut -d '=' -f2 | cut -d '"' -f2)
|
|
||||||
TARGET_ARCH=$(echo "$BITBAKE_VARS" | grep ^TRANSLATED_TARGET_ARCH \
|
TARGET_ARCH=$(echo "$BITBAKE_VARS" | grep ^TRANSLATED_TARGET_ARCH \
|
||||||
| cut -d '=' -f2 | cut -d '"' -f2)
|
| cut -d '=' -f2 | cut -d '"' -f2)
|
||||||
TARGET_KERNEL_BUILDDIR=$(echo "$BITBAKE_VARS" | grep ^B= \
|
TARGET_KERNEL_BUILDDIR=$(echo "$BITBAKE_VARS" | grep ^B= \
|
||||||
| cut -d '=' -f2 | cut -d '"' -f2)
|
| cut -d '=' -f2 | cut -d '"' -f2)
|
||||||
|
|
||||||
|
# Build and populate the recipe-sysroot-native with systemtap-native
|
||||||
|
pushd $PWD
|
||||||
|
cd $BUILDDIR
|
||||||
|
BITBAKE_VARS=`bitbake -e systemtap-native`
|
||||||
|
popd
|
||||||
|
SYSTEMTAP_HOST_INSTALLDIR=$(echo "$BITBAKE_VARS" | grep ^STAGING_DIR_NATIVE \
|
||||||
|
| cut -d '=' -f2 | cut -d '"' -f2)
|
||||||
|
|
||||||
systemtap_target_arch "$TARGET_ARCH"
|
systemtap_target_arch "$TARGET_ARCH"
|
||||||
|
|
||||||
if [ ! -d $TARGET_KERNEL_BUILDDIR ] ||
|
if [ ! -d $TARGET_KERNEL_BUILDDIR ] ||
|
||||||
|
@ -125,6 +131,7 @@ if [ ! -f $SYSTEMTAP_HOST_INSTALLDIR/usr/bin/stap ]; then
|
||||||
echo -e "\nError: Native (host) systemtap not found."
|
echo -e "\nError: Native (host) systemtap not found."
|
||||||
echo -e "Did you accidentally build a local non-sdk image? (or forget to"
|
echo -e "Did you accidentally build a local non-sdk image? (or forget to"
|
||||||
echo -e "add 'tools-profile' to EXTRA_IMAGE_FEATURES in your local.conf)?"
|
echo -e "add 'tools-profile' to EXTRA_IMAGE_FEATURES in your local.conf)?"
|
||||||
|
echo -e "You can also: bitbake -c addto_recipe_sysroot systemtap-native"
|
||||||
setup_usage
|
setup_usage
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue