diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-06 16:56:01 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-14 20:26:34 +0100 |
commit | 31970fb2a4e1d7b8c263bd8ef87454e30e9c9762 (patch) | |
tree | 9d091c5bfc15c3872257f658eb11b5497e3b2be4 | |
parent | 6327db048b78daaae31b1e3535de242d4b2405da (diff) | |
download | poky-31970fb2a4e1d7b8c263bd8ef87454e30e9c9762.tar.gz |
base: Avoid circular references to our own scripts
We'd like to intercept git calls but we don't want circular references
and HOSTTOOLS currently sets them up. Tweak to avoid them.
(From OE-Core rev: 1567b7cec5ccbe198bfd0cca9ee8a2b1cf6dbf42)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 52c37e133fa55846aca2248ffcf3a10648dbb8d7)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/base.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 9ed736b0e1..19604a4646 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -122,6 +122,10 @@ def setup_hosttools_dir(dest, toolsvar, d, fatal=True): | |||
122 | tools = d.getVar(toolsvar).split() | 122 | tools = d.getVar(toolsvar).split() |
123 | origbbenv = d.getVar("BB_ORIGENV", False) | 123 | origbbenv = d.getVar("BB_ORIGENV", False) |
124 | path = origbbenv.getVar("PATH") | 124 | path = origbbenv.getVar("PATH") |
125 | # Need to ignore our own scripts directories to avoid circular links | ||
126 | for p in path.split(":"): | ||
127 | if p.endswith("/scripts"): | ||
128 | path = path.replace(p, "/ignoreme") | ||
125 | bb.utils.mkdirhier(dest) | 129 | bb.utils.mkdirhier(dest) |
126 | notfound = [] | 130 | notfound = [] |
127 | for tool in tools: | 131 | for tool in tools: |