summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorOla x Nilsson <ola.x.nilsson@axis.com>2017-05-30 12:16:31 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-03 23:46:06 +0100
commit1deb4a00ba049e9d13c7991e5fba867b590d2c43 (patch)
tree2d0195e1fa04a1033b93c00501e259c242d0ba50 /scripts
parentdd2f42352578bee8ad00f04c94faab9b0a7e18e2 (diff)
downloadpoky-1deb4a00ba049e9d13c7991e5fba867b590d2c43.tar.gz
devtool: Compare abspath of both B and S
Either both or none of the paths must be passed through os.path.abspath or things like 'A//B', 'A/./B/', and 'A/B/' in S will cause unintentional mismatches even when B = "${S}". Using os.path.abspath for both seems more likely to be correct as that will also handle the case where ${B} != ${S} but the abspaths are equal. (From OE-Core rev: 061f2aab40fecbfe0dcb928baa95d6b3a6b45eed) Signed-off-by: Ola x Nilsson <olani@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py
index d646b0cf63..29c4c05071 100644
--- a/scripts/lib/devtool/__init__.py
+++ b/scripts/lib/devtool/__init__.py
@@ -191,7 +191,7 @@ def use_external_build(same_dir, no_same_dir, d):
191 logger.info('Using source tree as build directory since --same-dir specified') 191 logger.info('Using source tree as build directory since --same-dir specified')
192 elif bb.data.inherits_class('autotools-brokensep', d): 192 elif bb.data.inherits_class('autotools-brokensep', d):
193 logger.info('Using source tree as build directory since recipe inherits autotools-brokensep') 193 logger.info('Using source tree as build directory since recipe inherits autotools-brokensep')
194 elif d.getVar('B') == os.path.abspath(d.getVar('S')): 194 elif os.path.abspath(d.getVar('B')) == os.path.abspath(d.getVar('S')):
195 logger.info('Using source tree as build directory since that would be the default for this recipe') 195 logger.info('Using source tree as build directory since that would be the default for this recipe')
196 else: 196 else:
197 b_is_s = False 197 b_is_s = False