summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2015-02-09 10:03:45 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-17 22:39:31 +0100
commit29855df01e6480ac09c7bd088e79ae64fe45886e (patch)
treed91617fec93bec964ac0a332246614217aa9e55b /meta
parent7bd5bf8947c1203a89687b4a3b4c21c5bc4f854d (diff)
downloadpoky-29855df01e6480ac09c7bd088e79ae64fe45886e.tar.gz
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) (From OE-Core rev: 9f2825cf35d04ec99d29e0e4266410a8843dd80d) 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> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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
158 $SUDO_EXEC find $replace -type f -exec file '{}' \; | \ 158 $SUDO_EXEC find $replace -type f -exec file '{}' \; | \
159 grep ":.*\(ASCII\|script\|source\).*text" | \ 159 grep ":.*\(ASCII\|script\|source\).*text" | \
160 awk -F':' '{printf "\"%s\"\n", $1}' | \ 160 awk -F':' '{printf "\"%s\"\n", $1}' | \
161 grep -v "$target_sdk_dir/environment-setup-*" | \
161 $SUDO_EXEC xargs -n32 sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" 162 $SUDO_EXEC xargs -n32 sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g"
162done 163done
163 164