From 1c5be7705ef32f3430fa4551b571e91192207d13 Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Wed, 4 Feb 2015 08:54:58 -0600 Subject: files/toolchain-shar-template.sh: fix replace target_sdk_dir twice in environment setup file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-template.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'meta/files') 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 -- cgit 1.2.3-korg