]> code.ossystems Code Review - openembedded-core.git/commit
meta: toolchain-shar-relocate.sh: Do not use $target_sdk_dir as regex
authorMarek Vasut <marex@denx.de>
Wed, 23 Dec 2020 16:50:02 +0000 (17:50 +0100)
committerAnuj Mittal <anuj.mittal@intel.com>
Tue, 19 Jan 2021 03:40:08 +0000 (11:40 +0800)
commitb97f2901c66d6343c49d5bf90d538aa22aeae79d
tree326406d789aa7c8d82cb22e107c3b545e8a322a8
parentf097519cb5d2acc65674f3a1d4c1c716cd2e75ca
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 <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>
(cherry picked from commit 19d9fa7ab6c851000bc5d24281739e1b2bb8f057)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
meta/files/toolchain-shar-relocate.sh