]> code.ossystems Code Review - openembedded-core.git/commit
meta: toolchain-shar-relocate.sh: Filter out post-relocate-setup script
authorMarek Vasut <marex@denx.de>
Wed, 23 Dec 2020 16:50:03 +0000 (17:50 +0100)
committerSteve Sakoman <steve@sakoman.com>
Wed, 13 Jan 2021 15:31:44 +0000 (05:31 -1000)
commit6c3c6d9c3addaaf942e8f029b44dc17fb3aa19fd
tree7dcb8c579cccb5789e1bf6a937bf7101771376f8
parentcf21f0c99676793c7adf95b3dc72c42ab24e13a2
meta: toolchain-shar-relocate.sh: Filter out post-relocate-setup script

The toolchain-shar-extract.sh script updates the SDK relocation paths in
post-relocate-setup.sh, so avoid doing this twice. This is generally not
a problem, unless the SDK path is a subset of the SDK relocation path, in
which case the resulting path is substituted twice. To trigger the issue,
  $ ./tmp/deploy/sdk/poky-glibc-x86_64-core-image-base-core2-64-qemux86-64-toolchain-3.2+snapshot.sh -y -d /home/oe/.local/opt/poky/3.2+snapshot
which generates relocation path
  /home/oe/.local/home/oe/.local/opt/poky/3.2+snapshot
instead of
  /home/oe/.local/opt/poky/3.2+snapshot

Fixes: 93ec145f42 ("toolchain-shar-extract: Add post-relocate scripts")
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 5000aabe6ac336e7b424dafa1bf76271dee6a6f1)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/files/toolchain-shar-relocate.sh