[oe-commits] =?UTF-8?Q?An=C3=ADbal=20Lim=C3=B3n=20?=: files/toolchain-shar-template.sh: fix replace target_sdk_dir twice in environment setup file
git at git.openembedded.org
git at git.openembedded.org
Sat Feb 7 18:53:16 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 02ecaa69abe97fe2f01cd609e0e59933c0f9ddbf
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=02ecaa69abe97fe2f01cd609e0e59933c0f9ddbf
Author: Aníbal Limón <anibal.limon at linux.intel.com>
Date: Wed Feb 4 08:54:58 2015 -0600
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 at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/files/toolchain-shar-template.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-template.sh
index 0d679a6..4a7fbd5 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
More information about the Openembedded-commits
mailing list