files/toolchain-shar-template.sh: fix replace target_sdk_dir twice in environment setup file
PATCH 1/1 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 <[email protected]>
--- meta/files/toolchain-shar-template.sh | 1 + 1 file changed, 1 insertion(+)
meta/files/toolchain-shar-template.sh +1 -0
@@ -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
Signature · 1 line
1.9.1