diff options
Diffstat (limited to 'meta/files')
| -rw-r--r-- | meta/files/toolchain-shar-extract.sh | 3 | ||||
| -rw-r--r-- | meta/files/toolchain-shar-relocate.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index dd9342758b..4386b985bb 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh | |||
| @@ -56,7 +56,8 @@ if ! xz -V > /dev/null 2>&1; then | |||
| 56 | exit 1 | 56 | exit 1 |
| 57 | fi | 57 | fi |
| 58 | 58 | ||
| 59 | DEFAULT_INSTALL_DIR="@SDKPATH@" | 59 | SDK_BUILD_PATH="@SDKPATH@" |
| 60 | DEFAULT_INSTALL_DIR="@SDKPATHINSTALL@" | ||
| 60 | SUDO_EXEC="" | 61 | SUDO_EXEC="" |
| 61 | EXTRA_TAR_OPTIONS="" | 62 | EXTRA_TAR_OPTIONS="" |
| 62 | target_sdk_dir="" | 63 | target_sdk_dir="" |
diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh index 5433741296..8ea6194eca 100644 --- a/meta/files/toolchain-shar-relocate.sh +++ b/meta/files/toolchain-shar-relocate.sh | |||
| @@ -61,7 +61,7 @@ done | xargs -n100 file | grep ":.*\(ASCII\|script\|source\).*text" | \ | |||
| 61 | -e "$target_sdk_dir/post-relocate-setup" \ | 61 | -e "$target_sdk_dir/post-relocate-setup" \ |
| 62 | -e "$target_sdk_dir/${0##*/}" | \ | 62 | -e "$target_sdk_dir/${0##*/}" | \ |
| 63 | xargs -n100 $SUDO_EXEC sed -i \ | 63 | xargs -n100 $SUDO_EXEC sed -i \ |
| 64 | -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \ | 64 | -e "s:$SDK_BUILD_PATH:$target_sdk_dir:g" \ |
| 65 | -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" \ | 65 | -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" \ |
| 66 | -e "s: /usr/bin/perl: /usr/bin/env perl:g" | 66 | -e "s: /usr/bin/perl: /usr/bin/env perl:g" |
| 67 | 67 | ||