Re: [PATCH V2] meta: toolchain-shar-relocate.sh: Fix for extracting SDK in

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1580 bytes --]

On Tue, Mar 08, 2016 at 04:23:23PM +0000, Zawadzki, Krzysztof (Nokia - PL/Wroclaw) wrote:
> If SDK will be extracted in the same folder as sdk shar script.
>  The shar_relocate will substitute SDK.sh script SDKPATH  with extract destination path.
>  After that operation no one will be able use this sdk script as paths in it will be different.
>  To fix this we need to filter out sdk script and relocate_sdk scripts from  SDKPATH substitution

The subject line seems to be missing something.

> Signed-off-by: Krzysztof Zawadzki <krzysztof.zawadzki@nokia.com>
> 
> 
> diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh
> index 4f34fb4..d4bcf0e 100644
> --- a/meta/files/toolchain-shar-relocate.sh
> +++ b/meta/files/toolchain-shar-relocate.sh
> @@ -47,7 +47,7 @@ for replace in "$target_sdk_dir -maxdepth 1" "$native_sysroot"; do
>  	$SUDO_EXEC find $replace -type f
>  done | xargs -n100 file | grep ":.*\(ASCII\|script\|source\).*text" | \
>      awk -F':' '{printf "\"%s\"\n", $1}' | \
> -    grep -v "$target_sdk_dir/environment-setup-*" | \
> +    grep -Ev "$target_sdk_dir/(environment-setup-*|relocate_sdk*|${0##*/})" | \
>      xargs -n100 $SUDO_EXEC sed -i \
>          -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \
>          -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" \
> 
> 
> -- 
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]