From cf21f0c99676793c7adf95b3dc72c42ab24e13a2 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 23 Dec 2020 17:50:02 +0100 Subject: meta: toolchain-shar-relocate.sh: Do not use $target_sdk_dir as regex The $target_sdk_dir path might contain special characters, for example if the path is /opt/poky/3.2+snapshot . Prevent grep from interpreting those as part of the regex by using the -F parameter and multiple -e parameters to specify which strings to filter out. Also note that the previous regex was using asterisk as wildcard (e.g. environment-setup-*), but that should have been regex (e.g. environment-setup-.*, with dot) to match correctly, this is also fixed by this change. Fixes: 9721378688 ("toolchain-shar-template.sh: Make relocation optional.") Signed-off-by: Marek Vasut Cc: Joshua Watt Cc: Krzysztof Zawadzki Cc: Randy Witt Cc: Richard Purdie Cc: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 19d9fa7ab6c851000bc5d24281739e1b2bb8f057) Signed-off-by: Steve Sakoman --- meta/files/toolchain-shar-relocate.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh index e3c10018ef..9c358a53e2 100644 --- a/meta/files/toolchain-shar-relocate.sh +++ b/meta/files/toolchain-shar-relocate.sh @@ -56,7 +56,9 @@ for replace in "$target_sdk_dir -maxdepth 1" "$native_sysroot"; do $SUDO_EXEC find $replace -type f done | xargs -n100 file | grep ":.*\(ASCII\|script\|source\).*text" | \ awk -F':' '{printf "\"%s\"\n", $1}' | \ - grep -Ev "$target_sdk_dir/(environment-setup-*|relocate_sdk*|${0##*/})" | \ + grep -Fv -e "$target_sdk_dir/environment-setup-" \ + -e "$target_sdk_dir/relocate_sdk" \ + -e "$target_sdk_dir/${0##*/}" | \ 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" \ -- cgit 1.2.3-korg