diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-09-27 23:58:37 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-29 15:15:47 +0100 |
| commit | a619f8e5fd8b88278d41a3d82aca5a8d03cb2907 (patch) | |
| tree | 8e26c9e128c09d185b4faf8f318222dde6ca58c1 /meta/files | |
| parent | baa4e43a29e45df17eaa3456acc179b08d571db6 (diff) | |
| download | openembedded-core-a619f8e5fd8b88278d41a3d82aca5a8d03cb2907.tar.gz openembedded-core-a619f8e5fd8b88278d41a3d82aca5a8d03cb2907.tar.bz2 openembedded-core-a619f8e5fd8b88278d41a3d82aca5a8d03cb2907.zip | |
toolchain-shar-relocate.sh: make it faster
Make the extrating faster by:
* Merge the two heavy "for .. find" loops into one
* Move the commands out of for loop rather than inside, this can reduce the
forking amount.
As a result, when install:
* buildtools-nativesdk-standalone: 14s -> 7s (50% saved)
* core-image-minimal-core2-64-toolchain: 56s -> 47s (17% saved)
[YOCTO #8404]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/files')
| -rw-r--r-- | meta/files/toolchain-shar-relocate.sh | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh index dfb8e16d7c..4ef2927171 100644 --- a/meta/files/toolchain-shar-relocate.sh +++ b/meta/files/toolchain-shar-relocate.sh @@ -26,25 +26,21 @@ if [ $relocate = 1 ] ; then fi fi -# replace @SDKPATH@ with the new prefix in all text files: configs/scripts/etc +# replace @SDKPATH@ with the new prefix in all text files: configs/scripts/etc. +# replace the host perl with SDK perl. 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 + $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-*" | \ + 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" \ + -e "s: /usr/bin/perl: /usr/bin/env perl:g" # change all symlinks pointing to @SDKPATH@ for l in $($SUDO_EXEC find $native_sysroot -type l); do $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l done -# find out all perl scripts in $native_sysroot and modify them replacing the -# host perl with SDK perl. -for perl_script in $($SUDO_EXEC find $native_sysroot -type f -exec grep -l "^#!.*perl" '{}' \;); do - $SUDO_EXEC sed -i -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" -e \ - "s: /usr/bin/perl: /usr/bin/env perl:g" $perl_script -done - echo done |