summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-03-30 14:34:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-31 10:10:29 +0100
commit2a934a3df72bdf7e1e9c27db4cc586a163508b55 (patch)
treef82e8179fe52666f35d02ad94105f37ed43b9b86 /meta
parent555c48fb010147f24325abdd48721da7ad59348b (diff)
downloadpoky-2a934a3df72bdf7e1e9c27db4cc586a163508b55.tar.gz
base.bbclass: ensure HOSTTOOLS links point to executables
Use the new executable argument to bb.utils.which() to ensure that the symlinks point to executable files and not for example directories with the right name which happened to be on $PATH. [ YOCTO #11256 ] (From OE-Core rev: 7f40c934c3aeb1d34f95f30b281e25a17c428fce) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index cf8748a502..e29821f199 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -128,9 +128,9 @@ def setup_hosttools_dir(dest, toolsvar, d, fatal=True):
128 for tool in tools: 128 for tool in tools:
129 desttool = os.path.join(dest, tool) 129 desttool = os.path.join(dest, tool)
130 if not os.path.exists(desttool): 130 if not os.path.exists(desttool):
131 srctool = bb.utils.which(path, tool) 131 srctool = bb.utils.which(path, tool, executable=True)
132 if "ccache" in srctool: 132 if "ccache" in srctool:
133 srctool = bb.utils.which(path, tool, direction=1) 133 srctool = bb.utils.which(path, tool, executable=True, direction=1)
134 if srctool: 134 if srctool:
135 os.symlink(srctool, desttool) 135 os.symlink(srctool, desttool)
136 else: 136 else: