mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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.")
(From OE-Core rev: 19d9fa7ab6c851000bc5d24281739e1b2bb8f057)
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Joshua Watt <JPEWhacker@gmail.com>
Cc: Krzysztof Zawadzki <krzysztof.zawadzki@nokia.com>
Cc: Randy Witt <randy.e.witt@linux.intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
86358ef49b
commit
ced1f30c6f
@@ -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" \
|
||||
|
||||
Reference in New Issue
Block a user