diff options
| author |   Aníbal Limón <anibal.limon@linux.intel.com> | 2015-02-04 08:54:58 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-07 18:52:44 +0000 |
| commit | 02ecaa69abe97fe2f01cd609e0e59933c0f9ddbf (patch) | |
| tree | d766a1e7f9644dec0f807a3b0a4444a82a04f08b /meta | |
| parent | ba079975fa984f53fde5b4e8131d0f3877323e6c (diff) | |
| download | openembedded-core-02ecaa69abe97fe2f01cd609e0e59933c0f9ddbf.tar.gz | |
files/toolchain-shar-template.sh: fix replace target_sdk_dir twice in environment setup file
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]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/files/toolchain-shar-template.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-template.sh index 0d679a66db..4a7fbd50c6 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 |