summaryrefslogtreecommitdiffstats
path: root/meta/files
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2015-02-04 08:54:58 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-08 08:00:26 +0000
commit1c5be7705ef32f3430fa4551b571e91192207d13 (patch)
tree4197a4d54206aa637f20c162f1bce1862b7a1b91 /meta/files
parent16a01784245ef0e9806f88f8a55d5d3a73c7ce35 (diff)
downloadopenembedded-core-contrib-1c5be7705ef32f3430fa4551b571e91192207d13.tar.gz
openembedded-core-contrib-1c5be7705ef32f3430fa4551b571e91192207d13.tar.bz2
openembedded-core-contrib-1c5be7705ef32f3430fa4551b571e91192207d13.zip
files/toolchain-shar-template.sh: fix replace target_sdk_dir twice in environment setup file
When specify a target sdk dir that contains default install dir as subdir, target_sdk_dir=/opt/poky/$version/ custom_target_sdk_dir=/opt/poky/$version/some The target_sdk_dir variable in environment-setup file is replaced twice causes to point to wrong PATH. In order to fix filter environment-setup file in second replacement. [YOCTO #7032] (From OE-Core rev: 02ecaa69abe97fe2f01cd609e0e59933c0f9ddbf) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/files')
-rw-r--r--meta/files/toolchain-shar-template.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-template.sh
index 0d679a66db..4a7fbd50c6 100644
--- a/meta/files/toolchain-shar-template.sh
+++ b/meta/files/toolchain-shar-template.sh
@@ -158,6 +158,7 @@ for replace in "$target_sdk_dir -maxdepth 1" "$native_sysroot"; do
$SUDO_EXEC find $replace -type f -exec file '{}' \; | \
grep ":.*\(ASCII\|script\|source\).*text" | \
awk -F':' '{printf "\"%s\"\n", $1}' | \
+ grep -v "$target_sdk_dir/environment-setup-*" | \
$SUDO_EXEC xargs -n32 sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g"
done