[oe-commits] [openembedded-core] 43/43: meta: toolchain-shar-relocate.sh: Fix for extracting SDK in the same directory as SDK script.

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 459d9f352e2d26d7898320457112685557b630d6
Author: Zawadzki, Krzysztof (Nokia - PL/Wroclaw) <krzysztof.zawadzki at nokia.com>
AuthorDate: Tue Mar 8 19:53:28 2016 +0000

    meta: toolchain-shar-relocate.sh: Fix for extracting SDK in the same directory as SDK script.
    
    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
    
    Signed-off-by: Krzysztof Zawadzki <krzysztof.zawadzki at nokia.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/files/toolchain-shar-relocate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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" \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.