All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Steve Sakoman" <steve@sakoman.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][dunfell 03/19] meta: toolchain-shar-relocate.sh: Filter out post-relocate-setup script
Date: Mon, 18 Jan 2021 12:36:11 -1000	[thread overview]
Message-ID: <6c3c6d9c3addaaf942e8f029b44dc17fb3aa19fd.1611009050.git.steve@sakoman.com> (raw)
In-Reply-To: <cover.1611009050.git.steve@sakoman.com>

From: Marek Vasut <marex@denx.de>

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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh
index 9c358a53e2..94d288ce05 100644
--- a/meta/files/toolchain-shar-relocate.sh
+++ b/meta/files/toolchain-shar-relocate.sh
@@ -58,6 +58,7 @@ done | xargs -n100 file | grep ":.*\(ASCII\|script\|source\).*text" | \
     awk -F':' '{printf "\"%s\"\n", $1}' | \
     grep -Fv -e "$target_sdk_dir/environment-setup-" \
              -e "$target_sdk_dir/relocate_sdk" \
+             -e "$target_sdk_dir/post-relocate-setup" \
              -e "$target_sdk_dir/${0##*/}" | \
     xargs -n100 $SUDO_EXEC sed -i \
         -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \
-- 
2.17.1


  parent reply	other threads:[~2021-01-18 22:37 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-18 22:36 [OE-core][dunfell 00/19] Patch review Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 01/19] go.bbclass: don't stage test data with sources of dependencies Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 02/19] meta: toolchain-shar-relocate.sh: Do not use $target_sdk_dir as regex Steve Sakoman
2021-01-18 22:36 ` Steve Sakoman [this message]
2021-01-18 22:36 ` [OE-core][dunfell 04/19] systemd.bbclass: improve error message when a service unit specified in SYSTEMD_SERVICE is not found Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 05/19] license_image.bbclass: fix missing recipeinfo on self Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 06/19] linux-yocto/5.4: update to v5.4.87 Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 07/19] scripts: oe-run-native, fix *-native directories Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 08/19] buildstats.bbclass: add functionality to collect build system stats Steve Sakoman
2021-01-18 23:34   ` Richard Purdie
2021-01-18 23:44     ` Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 09/19] toolchain-shar-extract.sh: Handle special characters in script path Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 10/19] lib/oe/utils: Return empty string in parallel_make Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 11/19] boost: drop arm-intrinsics.patch Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 12/19] classes/waf: Add build and install arguments Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 13/19] waf: don't assume the waf intepretter is good Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 14/19] curl: fix CVE-2020-8231/8284/8285/8286 Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 15/19] xorg: Security fix for CVE-2020-14345 Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 16/19] glibc: Security fix for CVE-2020-29573 Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 17/19] glibc: CVE-2019-25013 Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 18/19] zip: whitelist CVE-2018-13410 and CVE-2018-13684 Steve Sakoman
2021-01-18 22:36 ` [OE-core][dunfell 19/19] ppp: Whitelist CVE-2020-15704 Steve Sakoman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6c3c6d9c3addaaf942e8f029b44dc17fb3aa19fd.1611009050.git.steve@sakoman.com \
    --to=steve@sakoman.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.