[dizzy][PATCH] files/toolchain-shar-template.sh: fix replace target_sdk_dir twice in environment setup file

[dizzy][PATCH] files/toolchain-shar-template.sh: fix replace target_sdk_dir twice in environment setup file

[Aníbal Limón]

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>
---
 meta/files/toolchain-shar-template.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-template.sh
index 0d679a6..4a7fbd5 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
 
-- 
1.9.1

Re: [dizzy][PATCH] files/toolchain-shar-template.sh: fix replace target_sdk_dir twice in environment setup file

[akuster808]

staging.

thanks.

- armin

On 02/09/2015 08:03 AM, Aníbal Limón wrote:
> 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>
> ---
>   meta/files/toolchain-shar-template.sh | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-template.sh
> index 0d679a6..4a7fbd5 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
>
>