summaryrefslogtreecommitdiffstats
path: root/scripts/crosstap
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2017-03-07 20:12:10 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-08 11:52:56 (GMT)
commit07eca818019e1969c78afa8932f0e2cda1fc8e72 (patch)
tree2a615c0c22a3de5d417a3ea14a7aaeb8ee5ef21e /scripts/crosstap
parent3f0037ce3c49ecc98c486ebf90844a4db4976b14 (diff)
downloadpoky-07eca818019e1969c78afa8932f0e2cda1fc8e72.tar.gz
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>
Diffstat (limited to 'scripts/crosstap')
-rwxr-xr-xscripts/crosstap11
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/crosstap b/scripts/crosstap
index 58317cf..39739bb 100755
--- a/scripts/crosstap
+++ b/scripts/crosstap
@@ -104,13 +104,19 @@ STAGING_BINDIR_TOOLCHAIN=$(echo "$BITBAKE_VARS" | grep ^STAGING_BINDIR_TOOLCHAIN
104 | cut -d '=' -f2 | cut -d '"' -f2) 104 | cut -d '=' -f2 | cut -d '"' -f2)
105STAGING_BINDIR_TOOLPREFIX=$(echo "$BITBAKE_VARS" | grep ^TARGET_PREFIX \ 105STAGING_BINDIR_TOOLPREFIX=$(echo "$BITBAKE_VARS" | grep ^TARGET_PREFIX \
106 | cut -d '=' -f2 | cut -d '"' -f2) 106 | cut -d '=' -f2 | cut -d '"' -f2)
107SYSTEMTAP_HOST_INSTALLDIR=$(echo "$BITBAKE_VARS" | grep ^STAGING_DIR_NATIVE \
108 | cut -d '=' -f2 | cut -d '"' -f2)
109TARGET_ARCH=$(echo "$BITBAKE_VARS" | grep ^TRANSLATED_TARGET_ARCH \ 107TARGET_ARCH=$(echo "$BITBAKE_VARS" | grep ^TRANSLATED_TARGET_ARCH \
110 | cut -d '=' -f2 | cut -d '"' -f2) 108 | cut -d '=' -f2 | cut -d '"' -f2)
111TARGET_KERNEL_BUILDDIR=$(echo "$BITBAKE_VARS" | grep ^B= \ 109TARGET_KERNEL_BUILDDIR=$(echo "$BITBAKE_VARS" | grep ^B= \
112 | cut -d '=' -f2 | cut -d '"' -f2) 110 | cut -d '=' -f2 | cut -d '"' -f2)
113 111
112# Build and populate the recipe-sysroot-native with systemtap-native
113pushd $PWD
114cd $BUILDDIR
115BITBAKE_VARS=`bitbake -e systemtap-native`
116popd
117SYSTEMTAP_HOST_INSTALLDIR=$(echo "$BITBAKE_VARS" | grep ^STAGING_DIR_NATIVE \
118 | cut -d '=' -f2 | cut -d '"' -f2)
119
114systemtap_target_arch "$TARGET_ARCH" 120systemtap_target_arch "$TARGET_ARCH"
115 121
116if [ ! -d $TARGET_KERNEL_BUILDDIR ] || 122if [ ! -d $TARGET_KERNEL_BUILDDIR ] ||
@@ -125,6 +131,7 @@ if [ ! -f $SYSTEMTAP_HOST_INSTALLDIR/usr/bin/stap ]; then
125 echo -e "\nError: Native (host) systemtap not found." 131 echo -e "\nError: Native (host) systemtap not found."
126 echo -e "Did you accidentally build a local non-sdk image? (or forget to" 132 echo -e "Did you accidentally build a local non-sdk image? (or forget to"
127 echo -e "add 'tools-profile' to EXTRA_IMAGE_FEATURES in your local.conf)?" 133 echo -e "add 'tools-profile' to EXTRA_IMAGE_FEATURES in your local.conf)?"
134 echo -e "You can also: bitbake -c addto_recipe_sysroot systemtap-native"
128 setup_usage 135 setup_usage
129 exit 1 136 exit 1
130fi 137fi