summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-06 16:56:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-12 16:44:06 +0100
commit74522a6048c96eae41a856ef66cfffe6adb8ed98 (patch)
treeab0bb333b46f722518241205732efcbf706b5f68
parent6c843a5069095daf0d4fb8a10e9f5252b028ff01 (diff)
downloadpoky-74522a6048c96eae41a856ef66cfffe6adb8ed98.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: 9f4acb8d8b47349e7a4adbb25842a94c0947469a) 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.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 3515720bf9..bdb3ac33c6 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -115,6 +115,10 @@ def setup_hosttools_dir(dest, toolsvar, d, fatal=True):
115 tools = d.getVar(toolsvar).split() 115 tools = d.getVar(toolsvar).split()
116 origbbenv = d.getVar("BB_ORIGENV", False) 116 origbbenv = d.getVar("BB_ORIGENV", False)
117 path = origbbenv.getVar("PATH") 117 path = origbbenv.getVar("PATH")
118 # Need to ignore our own scripts directories to avoid circular links
119 for p in path.split(":"):
120 if p.endswith("/scripts"):
121 path = path.replace(p, "/ignoreme")
118 bb.utils.mkdirhier(dest) 122 bb.utils.mkdirhier(dest)
119 notfound = [] 123 notfound = []
120 for tool in tools: 124 for tool in tools: